mirror of
https://github.com/mikf/gallery-dl.git
synced 2024-11-25 12:12:34 +01:00
[twitter] add login support (#214)
This commit is contained in:
parent
fad5833245
commit
e730fc9045
@ -91,7 +91,7 @@ SmugMug https://www.smugmug.com/ |smugmug-C|
|
|||||||
The /b/ Archive https://thebarchive.com/ Threads
|
The /b/ Archive https://thebarchive.com/ Threads
|
||||||
Tsumino https://www.tsumino.com/ Galleries, Search Results Optional
|
Tsumino https://www.tsumino.com/ Galleries, Search Results Optional
|
||||||
Tumblr https://www.tumblr.com/ Images from Users, Likes, Posts, Tag-Searches Optional (OAuth)
|
Tumblr https://www.tumblr.com/ Images from Users, Likes, Posts, Tag-Searches Optional (OAuth)
|
||||||
Twitter https://twitter.com/ Media Timelines, Timelines, Tweets
|
Twitter https://twitter.com/ Media Timelines, Timelines, Tweets Optional
|
||||||
Wallhaven https://alpha.wallhaven.cc/ individual Images, Search Results Optional
|
Wallhaven https://alpha.wallhaven.cc/ individual Images, Search Results Optional
|
||||||
Warosu https://warosu.org/ Threads
|
Warosu https://warosu.org/ Threads
|
||||||
Weibo https://www.weibo.com/ Images from Users, Images from Statuses
|
Weibo https://www.weibo.com/ Images from Users, Images from Statuses
|
||||||
@ -99,7 +99,7 @@ WikiArt.org https://www.wikiart.org/ Artists, Artworks
|
|||||||
World Three http://www.slide.world-three.org/ Chapters, Manga
|
World Three http://www.slide.world-three.org/ Chapters, Manga
|
||||||
XVideos https://www.xvideos.com/ Images from Users, Galleries
|
XVideos https://www.xvideos.com/ Images from Users, Galleries
|
||||||
Yandere https://yande.re/ Pools, Popular Images, Posts, Tag-Searches
|
Yandere https://yande.re/ Pools, Popular Images, Posts, Tag-Searches
|
||||||
yaplog! https://yaplog.jp/ Images from Users, Posts
|
yaplog! https://yaplog.jp/ Blogs, Posts
|
||||||
|yuki-S| https://yuki.la/ Threads
|
|yuki-S| https://yuki.la/ Threads
|
||||||
Acidimg https://acidimg.cc/ individual Images
|
Acidimg https://acidimg.cc/ individual Images
|
||||||
Imagetwist https://imagetwist.com/ individual Images
|
Imagetwist https://imagetwist.com/ individual Images
|
||||||
|
@ -9,7 +9,8 @@
|
|||||||
"""Extract images from https://twitter.com/"""
|
"""Extract images from https://twitter.com/"""
|
||||||
|
|
||||||
from .common import Extractor, Message
|
from .common import Extractor, Message
|
||||||
from .. import text
|
from .. import text, exception
|
||||||
|
from ..cache import cache
|
||||||
|
|
||||||
|
|
||||||
class TwitterExtractor(Extractor):
|
class TwitterExtractor(Extractor):
|
||||||
@ -27,6 +28,7 @@ class TwitterExtractor(Extractor):
|
|||||||
self.videos = self.config("videos", False)
|
self.videos = self.config("videos", False)
|
||||||
|
|
||||||
def items(self):
|
def items(self):
|
||||||
|
self.login()
|
||||||
yield Message.Version, 1
|
yield Message.Version, 1
|
||||||
yield Message.Directory, self.metadata()
|
yield Message.Directory, self.metadata()
|
||||||
|
|
||||||
@ -54,6 +56,35 @@ class TwitterExtractor(Extractor):
|
|||||||
def tweets(self):
|
def tweets(self):
|
||||||
"""Yield HTML content of all relevant tweets"""
|
"""Yield HTML content of all relevant tweets"""
|
||||||
|
|
||||||
|
def login(self):
|
||||||
|
username, password = self._get_auth_info()
|
||||||
|
if username:
|
||||||
|
self._update_cookies(self._login_impl(username, password))
|
||||||
|
|
||||||
|
@cache(maxage=360*24*3600, keyarg=1)
|
||||||
|
def _login_impl(self, username, password):
|
||||||
|
self.log.info("Logging in as %s", username)
|
||||||
|
|
||||||
|
page = self.request(self.root + "/login").text
|
||||||
|
pos = page.index('name="authenticity_token"')
|
||||||
|
token = text.extract(page, 'value="', '"', pos-80)[0]
|
||||||
|
|
||||||
|
url = self.root + "/sessions"
|
||||||
|
data = {
|
||||||
|
"session[username_or_email]": username,
|
||||||
|
"session[password]" : password,
|
||||||
|
"authenticity_token" : token,
|
||||||
|
"ui_metrics" : '{"rf":{},"s":""}',
|
||||||
|
"scribe_log" : "",
|
||||||
|
"redirect_after_login" : "",
|
||||||
|
"remember_me" : "1",
|
||||||
|
}
|
||||||
|
response = self.request(url, method="POST", data=data)
|
||||||
|
|
||||||
|
if "/error" in response.url:
|
||||||
|
raise exception.AuthenticationError()
|
||||||
|
return self.session.cookies
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _data_from_tweet(tweet):
|
def _data_from_tweet(tweet):
|
||||||
data = text.extract_all(tweet, (
|
data = text.extract_all(tweet, (
|
||||||
|
@ -110,6 +110,7 @@ AUTH_MAP = {
|
|||||||
"smugmug" : "Optional (OAuth)",
|
"smugmug" : "Optional (OAuth)",
|
||||||
"tsumino" : "Optional",
|
"tsumino" : "Optional",
|
||||||
"tumblr" : "Optional (OAuth)",
|
"tumblr" : "Optional (OAuth)",
|
||||||
|
"twitter" : "Optional",
|
||||||
"wallhaven" : "Optional",
|
"wallhaven" : "Optional",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -227,6 +227,7 @@ def setup_test_config():
|
|||||||
config.set(("extractor", "nijie", "username"), email)
|
config.set(("extractor", "nijie", "username"), email)
|
||||||
config.set(("extractor", "seiga", "username"), email)
|
config.set(("extractor", "seiga", "username"), email)
|
||||||
config.set(("extractor", "danbooru", "username"), None)
|
config.set(("extractor", "danbooru", "username"), None)
|
||||||
|
config.set(("extractor", "twitter" , "username"), None)
|
||||||
|
|
||||||
config.set(("extractor", "deviantart", "client-id"), "7777")
|
config.set(("extractor", "deviantart", "client-id"), "7777")
|
||||||
config.set(("extractor", "deviantart", "client-secret"),
|
config.set(("extractor", "deviantart", "client-secret"),
|
||||||
|
Loading…
Reference in New Issue
Block a user