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

[pp:ugoira] forward frame data as '_ugoira_frame_data' (#6154, #6285)

Browse Source
This commit is contained in:
Mike Fährmann
2024-10-08 11:28:44 +02:00
parent c0835a0cd1
commit cc38042500
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gallery_dl/extractor/danbooru.py
View File

@@ -93,7 +93,8 @@ class DanbooruExtractor(BaseExtractor):
if post["extension"] == "zip": if post["extension"] == "zip":
if self.ugoira: if self.ugoira:
post["frames"] = self._ugoira_frames(post) post["_ugoira_frame_data"] = post["frames"] = \
self._ugoira_frames(post)
post["_http_adjust_extension"] = False post["_http_adjust_extension"] = False
else: else:
url = post["large_file_url"] url = post["large_file_url"]

2
gallery_dl/extractor/pixiv.py
View File

@@ -136,7 +136,7 @@ class PixivExtractor(Extractor):
def _extract_ugoira(self, work): def _extract_ugoira(self, work):
ugoira = self.api.ugoira_metadata(work["id"]) ugoira = self.api.ugoira_metadata(work["id"])
url = ugoira["zip_urls"]["medium"] url = ugoira["zip_urls"]["medium"]
work["frames"] = frames = ugoira["frames"] work["_ugoira_frame_data"] = work["frames"] = frames = ugoira["frames"]
work["date_url"] = self._date_from_url(url) work["date_url"] = self._date_from_url(url)
work["_http_adjust_extension"] = False work["_http_adjust_extension"] = False

4
gallery_dl/postprocessor/ugoira.py
View File

@@ -105,11 +105,11 @@ class UgoiraPP(PostProcessor):
}, options) }, options)
def prepare(self, pathfmt): def prepare(self, pathfmt):
if "frames" not in pathfmt.kwdict: if "_ugoira_frame_data" not in pathfmt.kwdict:
self._frames = None self._frames = None
return return
self._frames = pathfmt.kwdict["frames"] self._frames = pathfmt.kwdict["_ugoira_frame_data"]
if pathfmt.extension == "zip": if pathfmt.extension == "zip":
self._convert_zip = True self._convert_zip = True
if self.delete: if self.delete: