github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[twitter] use a simpler data structure to store cookies in cache

Browse Source 
Use a dict with name-value pairs instead of an entire
RequestsCookieJar object.
This commit is contained in:
Mike Fährmann
2020-03-12 22:02:12 +01:00
parent 87d4f83597
commit 2d5703c493
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gallery_dl/extractor/twitter.py
View File

@@ -21,6 +21,7 @@ class TwitterExtractor(Extractor):
directory_fmt = ("{category}", "{user[name]}") directory_fmt = ("{category}", "{user[name]}")
filename_fmt = "{tweet_id}_{num}.{extension}" filename_fmt = "{tweet_id}_{num}.{extension}"
archive_fmt = "{tweet_id}_{retweet_id}_{num}" archive_fmt = "{tweet_id}_{retweet_id}_{num}"
cookiedomain = ".twitter.com"
root = "https://twitter.com" root = "https://twitter.com"
sizes = (":orig", ":large", ":medium", ":small") sizes = (":orig", ":large", ":medium", ":small")
user_agent = ("Mozilla/5.0 (Windows NT 6.1; WOW64; " user_agent = ("Mozilla/5.0 (Windows NT 6.1; WOW64; "
@@ -135,10 +136,14 @@ class TwitterExtractor(Extractor):
"remember_me" : "1", "remember_me" : "1",
} }
response = self.request(url, method="POST", headers=headers, data=data) response = self.request(url, method="POST", headers=headers, data=data)
if "/error" in response.url: if "/error" in response.url:
raise exception.AuthenticationError() raise exception.AuthenticationError()
return self.session.cookies
return {
cookie.name: cookie.value
for cookie in self.session.cookies
if cookie.domain and "twitter.com" in cookie.domain
}
def _data_from_tweet(self, tweet): def _data_from_tweet(self, tweet):
extr = text.extract_from(tweet) extr = text.extract_from(tweet)