Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2025-02-01 03:51:42 +01:00
Code Issues Releases Wiki Activity

[hitomi] extend URL pattern + follow redirects

Browse Source
This commit is contained in:
Mike Fährmann 2019-11-01 21:40:10 +01:00
parent e782b4b230
commit f8ac67ce50
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gallery_dl/extractor/hitomi.py
View File

@ -18,7 +18,9 @@ class HitomiGalleryExtractor(GalleryExtractor):
"""Extractor for image galleries from hitomi.la"""
category = "hitomi"
root = "https://hitomi.la"
pattern = r"(?:https?://)?hitomi\.la/(?:galleries|reader)/(\d+)"
pattern = (r"(?:https?://)?hitomi\.la"
r"/(?:manga|doujinshi|cg|gamecg|galleries|reader)"
r"/(?:[^/?&#]+-)?(\d+)")
test = (
("https://hitomi.la/galleries/867789.html", {
"pattern": r"https://aa.hitomi.la/galleries/867789/\d+.jpg",
@ -40,6 +42,11 @@ class HitomiGalleryExtractor(GalleryExtractor):
"url": "055c898a36389719799d6bce76889cc4ea4421fc",
"count": 1413,
}),
("https://hitomi.la/manga/amazon-no-hiyaku-867789.html"),
("https://hitomi.la/manga/867789.html"),
("https://hitomi.la/doujinshi/867789.html"),
("https://hitomi.la/cg/867789.html"),
("https://hitomi.la/gamecg/867789.html"),
("https://hitomi.la/reader/867789.html"),
)
@ -55,6 +62,11 @@ class HitomiGalleryExtractor(GalleryExtractor):
self.fallback = True
url = url.replace("/galleries/", "/reader/")
response = GalleryExtractor.request(self, url, **kwargs)
elif b"<title>Redirect</title>" in response.content:
url = text.extract(response.text, "href='", "'")[0]
if not url.startswith("http"):
url = text.urljoin(self.root, url)
response = self.request(url, **kwargs)
return response
def metadata(self, page):