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

use 'text.extract_from()' in a few places

Browse Source
This commit is contained in:
Mike Fährmann
2019-04-19 23:02:29 +02:00
parent 21a7e395a7
commit f2cf1c1d73
10 changed files with 116 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gallery_dl/extractor/twitter.py
View File

@@ -87,18 +87,15 @@ class TwitterExtractor(Extractor):
@staticmethod
def _data_from_tweet(tweet):
data = text.extract_all(tweet, (
("tweet_id" , 'data-tweet-id="' , '"'),
("retweet_id", 'data-retweet-id="' , '"'),
("retweeter" , 'data-retweeter="' , '"'),
("user" , 'data-screen-name="', '"'),
("username" , 'data-name="' , '"'),
("user_id" , 'data-user-id="' , '"'),
))[0]
for key in ("tweet_id", "retweet_id", "user_id"):
data[key] = text.parse_int(data[key])
data["retweeter"] = data["retweeter"] or ""
return data
extr = text.extract_from(tweet)
return {
"tweet_id" : text.parse_int(extr('data-tweet-id="' , '"')),
"retweet_id": text.parse_int(extr('data-retweet-id="', '"')),
"retweeter" : extr('data-retweeter="' , '"'),
"user" : extr('data-screen-name="', '"'),
"username" : extr('data-name="' , '"'),
"user_id" : text.parse_int(extr('data-user-id="' , '"')),
}
def _tweets_from_api(self, url):
params = {