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

[twitter] remove old-style URLs from image fallback lists

Browse Source
This commit is contained in:
Mike Fährmann
2021-06-28 16:25:24 +02:00
parent daf821b8b6
commit 035562bd11
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gallery_dl/extractor/twitter.py
View File

@@ -113,18 +113,16 @@ class TwitterExtractor(Extractor):
"url" : base + "orig", "url" : base + "orig",
"width" : width, "width" : width,
"height" : height, "height" : height,
"_fallback": self._image_fallback(base, url + ":"), "_fallback": self._image_fallback(base),
})) }))
else: else:
files.append({"url": media["media_url"]}) files.append({"url": media["media_url"]})
@staticmethod @staticmethod
def _image_fallback(new, old): def _image_fallback(base):
yield old + "orig" yield base + "large"
yield base + "medium"
for size in ("large", "medium", "small"): yield base + "small"
yield new + size
yield old + size
def _extract_card(self, tweet, files): def _extract_card(self, tweet, files):
card = tweet["card"] card = tweet["card"]
@@ -526,18 +524,17 @@ class TwitterImageExtractor(Extractor):
self.id, self.fmt = match.groups() self.id, self.fmt = match.groups()
def items(self): def items(self):
base = "https://pbs.twimg.com/media/" + self.id base = "https://pbs.twimg.com/media/{}?format={}&name=".format(
new = base + "?format=" + self.fmt + "&name=" self.id, self.fmt)
old = base + "." + self.fmt + ":"
data = { data = {
"filename": self.id, "filename": self.id,
"extension": self.fmt, "extension": self.fmt,
"_fallback": TwitterExtractor._image_fallback(new, old), "_fallback": TwitterExtractor._image_fallback(base),
} }
yield Message.Directory, data yield Message.Directory, data
yield Message.Url, new + "orig", data yield Message.Url, base + "orig", data
class TwitterAPI(): class TwitterAPI():