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

[hitomi] fix image URLs

Browse Source
This commit is contained in:
Mike Fährmann 2020-01-14 12:04:48 +01:00
parent bd5ce9855c
commit 8bb32ee188
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gallery_dl/extractor/hitomi.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright 2015-2019 Mike Fährmann # Copyright 2015-2020 Mike Fährmann
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as # it under the terms of the GNU General Public License version 2 as
@ -23,7 +23,7 @@ class HitomiGalleryExtractor(GalleryExtractor):
r"/(?:[^/?&#]+-)?(\d+)") r"/(?:[^/?&#]+-)?(\d+)")
test = ( test = (
("https://hitomi.la/galleries/867789.html", { ("https://hitomi.la/galleries/867789.html", {
"pattern": r"https://aa.hitomi.la/galleries/867789/\d+.jpg", "pattern": r"https://[a-c]a.hitomi.la/images/./../[0-9a-f]+.jpg",
"keyword": "6701f8f588f119ef84cd29bdf99a399417b0a6a2", "keyword": "6701f8f588f119ef84cd29bdf99a399417b0a6a2",
"count": 16, "count": 16,
}), }),
@ -34,12 +34,12 @@ class HitomiGalleryExtractor(GalleryExtractor):
}), }),
("https://hitomi.la/galleries/733697.html", { ("https://hitomi.la/galleries/733697.html", {
# Game CG with scenes (#321) # Game CG with scenes (#321)
"url": "c2a84185f467450b8b9b72fbe40c0649029ce007", "url": "21064f9e3c244aca87f1a91967a3fbe79032c4ce",
"count": 210, "count": 210,
}), }),
("https://hitomi.la/galleries/1045954.html", { ("https://hitomi.la/galleries/1045954.html", {
# fallback for galleries only available through /reader/ URLs # fallback for galleries only available through /reader/ URLs
"url": "055c898a36389719799d6bce76889cc4ea4421fc", "url": "0a67f5e6c3c6a384b578e328f4817fa6ccdf856a",
"count": 1413, "count": 1413,
}), }),
("https://hitomi.la/manga/amazon-no-hiyaku-867789.html"), ("https://hitomi.la/manga/amazon-no-hiyaku-867789.html"),
@ -96,12 +96,6 @@ class HitomiGalleryExtractor(GalleryExtractor):
return data return data
def images(self, page): def images(self, page):
# see https://ltn.hitomi.la/common.js
offset = text.parse_int(self.gallery_id[-1]) % 3
subdomain = chr(97 + offset) + "a"
base = "https://{}.hitomi.la/galleries/{}/".format(
subdomain, self.gallery_id)
# set Referer header before image downloads (#239) # set Referer header before image downloads (#239)
self.session.headers["Referer"] = self.gallery_url self.session.headers["Referer"] = self.gallery_url
@ -109,10 +103,20 @@ class HitomiGalleryExtractor(GalleryExtractor):
url = "https://ltn.hitomi.la/galleries/{}.js".format(self.gallery_id) url = "https://ltn.hitomi.la/galleries/{}.js".format(self.gallery_id)
page = self.request(url).text page = self.request(url).text
return [ result = []
(base + image["name"], None) for image in json.loads(page.partition("=")[2]):
for image in json.loads(page.partition("=")[2]) ihash = image["hash"]
] idata = text.nameext_from_url(image["name"])
# see https://ltn.hitomi.la/common.js
offset = int(ihash[-3:-1], 16) % 3
url = "https://{}a.hitomi.la/images/{}/{}/{}.{}".format(
chr(97 + offset),
ihash[-1], ihash[-3:-1], ihash,
idata["extension"],
)
result.append((url, idata))
return result
@staticmethod @staticmethod
def _prep(value): def _prep(value):