New upstream version 1.24.0.upstream/1.24.0

1 files changed, 20 insertions, 15 deletions

diff --git a/gallery_dl/extractor/hentaihere.py b/gallery_dl/extractor/hentaihere.py
index c3e6d76..38ec77c 100644
--- a/gallery_dl/extractor/hentaihere.py
+++ b/gallery_dl/extractor/hentaihere.py
@@ -30,19 +30,24 @@ class HentaihereChapterExtractor(HentaihereBase, ChapterExtractor):
             "keyword": "0207d20eea3a15d2a8d1496755bdfa49de7cfa9d",
         }),
         ("https://hentaihere.com/m/S23048/1.5/1/", {
-            "author": "Shinozuka Yuuji",
-            "chapter": 1,
-            "chapter_id": 80186,
-            "chapter_minor": ".5",
+            "pattern": r"https://hentaicdn\.com/hentai"
+                       r"/23048/1\.5/ccdn00\d+\.jpg",
             "count": 32,
-            "lang": "en",
-            "language": "English",
-            "manga": "High School Slut's Love Consultation",
-            "manga_id": 23048,
-            "page": int,
-            "title": "High School Slut's Love Consultation + "
-                     "Girlfriend [Full Color]",
-            "type": "Original",
+            "keyword": {
+                "author": "Shinozuka Yuuji",
+                "chapter": 1,
+                "chapter_id": 80186,
+                "chapter_minor": ".5",
+                "count": 32,
+                "lang": "en",
+                "language": "English",
+                "manga": "High School Slut's Love Consultation",
+                "manga_id": 23048,
+                "page": int,
+                "title": "High School Slut's Love Consultation + "
+                         "Girlfriend [Full Color]",
+                "type": "Original",
+            },
         }),
     )
 
@@ -52,8 +57,8 @@ class HentaihereChapterExtractor(HentaihereBase, ChapterExtractor):
         ChapterExtractor.__init__(self, match, url)
 
     def metadata(self, page):
-        title = text.extract(page, "<title>", "</title>")[0]
-        chapter_id = text.extract(page, 'report/C', '"')[0]
+        title = text.extr(page, "<title>", "</title>")
+        chapter_id = text.extr(page, 'report/C', '"')
         chapter, sep, minor = self.chapter.partition(".")
         pattern = r"Page 1 \| (.+) \(([^)]+)\) - Chapter \d+: (.+) by (.+) at "
         match = re.match(pattern, title)
@@ -72,7 +77,7 @@ class HentaihereChapterExtractor(HentaihereBase, ChapterExtractor):
 
     @staticmethod
     def images(page):
-        images = text.extract(page, "var rff_imageList = ", ";")[0]
+        images = text.extr(page, "var rff_imageList = ", ";")
         return [
             ("https://hentaicdn.com/hentai" + part, None)
             for part in json.loads(images)