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

[twitter] restructure media data extraction

Browse Source
This commit is contained in:
Mike Fährmann
2025-06-12 18:53:15 +02:00
parent 56ea27c474
commit 06e2f2cd91
1 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
gallery_dl/extractor/twitter.py
View File

@@ -174,38 +174,25 @@ class TwitterExtractor(Extractor):
if not self.unavailable: if not self.unavailable:
continue continue
mtype = media.get("type")
descr = media.get("ext_alt_text")
width = media["original_info"].get("width", 0)
height = media["original_info"].get("height", 0)
if "video_info" in media: if "video_info" in media:
if self.videos == "ytdl": if self.videos == "ytdl":
files.append({ file = {
"url": "ytdl:{}/i/web/status/{}".format( "url": "ytdl:{}/i/web/status/{}".format(
self.root, tweet["id_str"]), self.root, tweet["id_str"]),
"type" : mtype, "extension": "mp4",
"width" : width, }
"height" : height,
"extension" : None,
"description": descr,
})
elif self.videos: elif self.videos:
video_info = media["video_info"] video_info = media["video_info"]
variant = max( variant = max(
video_info["variants"], video_info["variants"],
key=lambda v: v.get("bitrate", 0), key=lambda v: v.get("bitrate", 0),
) )
files.append({ file = {
"url" : variant["url"], "url" : variant["url"],
"type" : mtype, "bitrate" : variant.get("bitrate", 0),
"width" : width, "duration": video_info.get(
"height" : height,
"bitrate" : variant.get("bitrate", 0),
"duration" : video_info.get(
"duration_millis", 0) / 1000, "duration_millis", 0) / 1000,
"description": descr, }
})
elif "media_url_https" in media: elif "media_url_https" in media:
url = media["media_url_https"] url = media["media_url_https"]
if url[-4] == ".": if url[-4] == ".":
@@ -213,16 +200,19 @@ class TwitterExtractor(Extractor):
base += "?format=" + fmt + "&name=" base += "?format=" + fmt + "&name="
else: else:
base = url.rpartition("=")[0] + "=" base = url.rpartition("=")[0] + "="
files.append(text.nameext_from_url(url, { file = text.nameext_from_url(url, {
"url" : base + self._size_image, "url" : base + self._size_image,
"type" : mtype, "_fallback": self._image_fallback(base),
"width" : width, })
"height" : height,
"_fallback" : self._image_fallback(base),
"description": descr,
}))
else: else:
files.append({"url": media["media_url"]}) files.append({"url": media["media_url"]})
continue
file["type"] = media.get("type")
file["width"] = media["original_info"].get("width", 0)
file["height"] = media["original_info"].get("height", 0)
file["description"] = media.get("ext_alt_text")
files.append(file)
def _image_fallback(self, base): def _image_fallback(self, base):
for fmt in self._size_fallback: for fmt in self._size_fallback: