From 8b910dd8ae030054bc0ecd06cba3ed4477b39a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Thu, 6 Jan 2022 18:21:26 +0100 Subject: [PATCH] [hitomi] fix image URLs again and again ... --- gallery_dl/extractor/hitomi.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gallery_dl/extractor/hitomi.py b/gallery_dl/extractor/hitomi.py index 2599ab5c..ce6c7ce8 100644 --- a/gallery_dl/extractor/hitomi.py +++ b/gallery_dl/extractor/hitomi.py @@ -196,6 +196,7 @@ def _parse_gg(extr): page = extr.request("https://ltn.hitomi.la/gg.js").text m = {} + keys = [] for match in re.finditer( r"case\s+(\d+):(?:\s*o\s*=\s*(\d+))?", page): @@ -208,7 +209,11 @@ def _parse_gg(extr): m[key] = value keys.clear() - d = re.search(r"default:\s*o\s*=\s*(\d+)", page) + for match in re.finditer( + r"if\s+\(g\s*===?\s*(\d+)\)[\s{]*o\s*=\s*(\d+)", page): + m[int(match.group(1))] = int(match.group(2)) + + d = re.search(r"(?:var\s|default:)\s*o\s*=\s*(\d+)", page) b = re.search(r"b:\s*[\"'](.+)[\"']", page) - return m, b.group(1).strip("/"), int(d.group(1)) if d else int(not value) + return m, b.group(1).strip("/"), int(d.group(1)) if d else 1