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

[hitomi] apply format check for every image (#3030) (#3280)

Browse Source
This commit is contained in:
sudo
2022-11-27 15:55:25 +01:00
committed by GitHub
parent a7c7953107
commit a6305d031c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gallery_dl/extractor/hitomi.py
View File

@@ -115,16 +115,17 @@ class HitomiGalleryExtractor(GalleryExtractor):
fmt = self.config("format") or "webp" fmt = self.config("format") or "webp"
if fmt == "original": if fmt == "original":
subdomain, fmt, ext, check = "b", "images", None, False subdomain, path, ext, check = "b", "images", None, False
else: else:
subdomain, ext, check = "a", fmt, True subdomain, path, ext, check = "a", fmt, fmt, (fmt != "webp")
result = [] result = []
for image in self.info["files"]: for image in self.info["files"]:
if check: if check:
if not image.get("has" + fmt): if image.get("has" + fmt):
fmt = ext = "webp" path = ext = fmt
check = False else:
path = ext = "webp"
ihash = image["hash"] ihash = image["hash"]
idata = text.nameext_from_url(image["name"]) idata = text.nameext_from_url(image["name"])
if ext: if ext:
@@ -134,7 +135,7 @@ class HitomiGalleryExtractor(GalleryExtractor):
inum = int(ihash[-1] + ihash[-3:-1], 16) inum = int(ihash[-1] + ihash[-3:-1], 16)
url = "https://{}{}.hitomi.la/{}/{}/{}/{}.{}".format( url = "https://{}{}.hitomi.la/{}/{}/{}/{}.{}".format(
chr(97 + gg_m.get(inum, gg_default)), chr(97 + gg_m.get(inum, gg_default)),
subdomain, fmt, gg_b, inum, ihash, idata["extension"], subdomain, path, gg_b, inum, ihash, idata["extension"],
) )
result.append((url, idata)) result.append((url, idata))
return result return result