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

[downloader:http] disable filename extension changes for ugoira

Browse Source 
(#1507)
This commit is contained in:
Mike Fährmann
2021-04-27 00:48:53 +02:00
parent e5123f56c9
commit 221015e586
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gallery_dl/downloader/http.py
View File

@@ -80,6 +80,10 @@ class HttpDownloader(DownloaderBase):
tries = 0 tries = 0
msg = "" msg = ""
kwdict = pathfmt.kwdict
adjust_extension = kwdict.get(
"_http_adjust_extension", self.adjust_extension)
if self.part: if self.part:
pathfmt.part_enable(self.partdir) pathfmt.part_enable(self.partdir)
@@ -105,7 +109,7 @@ class HttpDownloader(DownloaderBase):
if self.headers: if self.headers:
headers.update(self.headers) headers.update(self.headers)
# file-specific headers # file-specific headers
extra = pathfmt.kwdict.get("_http_headers") extra = kwdict.get("_http_headers")
if extra: if extra:
headers.update(extra) headers.update(extra)
@@ -139,7 +143,7 @@ class HttpDownloader(DownloaderBase):
return False return False
# check for invalid responses # check for invalid responses
validate = pathfmt.kwdict.get("_http_validate") validate = kwdict.get("_http_validate")
if validate and not validate(response): if validate and not validate(response):
self.log.warning("Invalid response") self.log.warning("Invalid response")
return False return False
@@ -168,7 +172,7 @@ class HttpDownloader(DownloaderBase):
content = response.iter_content(self.chunk_size) content = response.iter_content(self.chunk_size)
# check filename extension against file header # check filename extension against file header
if self.adjust_extension and not offset and \ if adjust_extension and not offset and \
pathfmt.extension in FILE_SIGNATURES: pathfmt.extension in FILE_SIGNATURES:
try: try:
file_header = next( file_header = next(
@@ -198,7 +202,7 @@ class HttpDownloader(DownloaderBase):
if file_header: if file_header:
fp.write(file_header) fp.write(file_header)
elif offset: elif offset:
if self.adjust_extension and \ if adjust_extension and \
pathfmt.extension in FILE_SIGNATURES: pathfmt.extension in FILE_SIGNATURES:
self._adjust_extension(pathfmt, fp.read(16)) self._adjust_extension(pathfmt, fp.read(16))
fp.seek(offset) fp.seek(offset)
@@ -222,10 +226,9 @@ class HttpDownloader(DownloaderBase):
self.downloading = False self.downloading = False
if self.mtime: if self.mtime:
pathfmt.kwdict.setdefault( kwdict.setdefault("_mtime", response.headers.get("Last-Modified"))
"_mtime", response.headers.get("Last-Modified"))
else: else:
pathfmt.kwdict["_mtime"] = None kwdict["_mtime"] = None
return True return True

1
gallery_dl/extractor/danbooru.py
View File

@@ -61,6 +61,7 @@ class DanbooruExtractor(Extractor):
"{}/posts/{}.json?only=pixiv_ugoira_frame_data".format( "{}/posts/{}.json?only=pixiv_ugoira_frame_data".format(
self.root, post["id"]) self.root, post["id"])
).json()["pixiv_ugoira_frame_data"]["data"] ).json()["pixiv_ugoira_frame_data"]["data"]
post["_http_adjust_extension"] = False
else: else:
url = post["large_file_url"] url = post["large_file_url"]
post["extension"] = "webm" post["extension"] = "webm"

1
gallery_dl/extractor/pixiv.py
View File

@@ -66,6 +66,7 @@ class PixivExtractor(Extractor):
url = ugoira["zip_urls"]["medium"].replace( url = ugoira["zip_urls"]["medium"].replace(
"_ugoira600x600", "_ugoira1920x1080") "_ugoira600x600", "_ugoira1920x1080")
work["frames"] = ugoira["frames"] work["frames"] = ugoira["frames"]
work["_http_adjust_extension"] = False
yield Message.Url, url, text.nameext_from_url(url, work) yield Message.Url, url, text.nameext_from_url(url, work)
elif work["page_count"] == 1: elif work["page_count"] == 1: