New upstream version 1.14.4.upstream/1.14.4

1 files changed, 87 insertions, 5 deletions

diff --git a/gallery_dl/extractor/mangapanda.py b/gallery_dl/extractor/mangapanda.py
index 18ef005..a4b8340 100644
--- a/gallery_dl/extractor/mangapanda.py
+++ b/gallery_dl/extractor/mangapanda.py
@@ -1,14 +1,15 @@
 # -*- 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
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 
-"""Extract manga-chapters and entire manga from https://www.mangapanda.com/"""
+"""Extractors for https://www.mangapanda.com/"""
 
-from .mangareader import MangareaderMangaExtractor, MangareaderChapterExtractor
+from .common import ChapterExtractor, MangaExtractor
+from .. import text
 
 
 class MangapandaBase():
@@ -16,21 +17,102 @@ class MangapandaBase():
     category = "mangapanda"
     root = "https://www.mangapanda.com"
 
+    @staticmethod
+    def parse_page(page, data):
+        """Parse metadata on 'page' and add it to 'data'"""
+        text.extract_all(page, (
+            ("manga"  , '<h2 class="aname">', '</h2>'),
+            ("release", '>Year of Release:</td>\n<td>', '</td>'),
+            ('author' , '>Author:</td>\n<td>', '</td>'),
+            ('artist' , '>Artist:</td>\n<td>', '</td>'),
+        ), values=data)
+        data["manga"] = data["manga"].strip()
+        data["author"] = text.unescape(data["author"])
+        data["artist"] = text.unescape(data["artist"])
+        return data
 
-class MangapandaChapterExtractor(MangapandaBase, MangareaderChapterExtractor):
+
+class MangapandaChapterExtractor(MangapandaBase, ChapterExtractor):
     """Extractor for manga-chapters from mangapanda.com"""
+    archive_fmt = "{manga}_{chapter}_{page}"
     pattern = r"(?:https?://)?(?:www\.)?mangapanda\.com((/[^/?&#]+)/(\d+))"
     test = ("https://www.mangapanda.com/red-storm/2", {
         "url": "1f633f776e950531ba9b1e81965316458e785261",
         "keyword": "b24df4b9cc36383fb6a44e06d32a3884a4dcb5fb",
     })
 
+    def __init__(self, match):
+        path, self.url_title, self.chapter = match.groups()
+        ChapterExtractor.__init__(self, match, self.root + path)
+
+    def metadata(self, chapter_page):
+        page = self.request(self.root + self.url_title).text
+        data = self.parse_page(page, {
+            "chapter": text.parse_int(self.chapter),
+            "lang": "en",
+            "language": "English",
+        })
+        text.extract_all(page, (
+            ('title', ' ' + self.chapter + '</a> : ', '</td>'),
+            ('date', '<td>', '</td>'),
+        ), page.index('<div id="chapterlist">'), data)
+        data["count"] = text.parse_int(text.extract(
+            chapter_page, '</select> of ', '<')[0]
+        )
+        return data
+
+    def images(self, page):
+        while True:
+            next_url, image_url, image_data = self.get_image_metadata(page)
+            yield image_url, image_data
+
+            if not next_url:
+                return
+            page = self.request(next_url).text
 
-class MangapandaMangaExtractor(MangapandaBase, MangareaderMangaExtractor):
+    def get_image_metadata(self, page):
+        """Collect next url, image-url and metadata for one manga-page"""
+        extr = text.extract
+        width = None
+        test , pos = extr(page, "document['pu']", '')
+        if test is None:
+            return None, None, None
+        if page.find("document['imgwidth']", pos, pos+200) != -1:
+            width , pos = extr(page, "document['imgwidth'] = ", ";", pos)
+            height, pos = extr(page, "document['imgheight'] = ", ";", pos)
+        _  , pos = extr(page, '<div id="imgholder">', '')
+        url, pos = extr(page, ' href="', '"', pos)
+        if width is None:
+            width , pos = extr(page, '<img id="img" width="', '"', pos)
+            height, pos = extr(page, ' height="', '"', pos)
+        image, pos = extr(page, ' src="', '"', pos)
+        return self.root + url, image, {
+            "width": text.parse_int(width),
+            "height": text.parse_int(height),
+        }
+
+
+class MangapandaMangaExtractor(MangapandaBase, MangaExtractor):
     """Extractor for manga from mangapanda.com"""
     chapterclass = MangapandaChapterExtractor
+    reverse = False
     pattern = r"(?:https?://)?(?:www\.)?mangapanda\.com(/[^/?&#]+)/?$"
     test = ("https://www.mangapanda.com/mushishi", {
         "url": "357f965732371cac1990fee8b480f62e29141a42",
         "keyword": "031b3ea085921c552de017ecbb9b906e462229c9",
     })
+
+    def chapters(self, page):
+        results = []
+        data = self.parse_page(page, {"lang": "en", "language": "English"})
+
+        needle = '<div class="chico_manga"></div>\n<a href="'
+        pos = page.index('<div id="chapterlist">')
+        while True:
+            url, pos = text.extract(page, needle, '"', pos)
+            if not url:
+                return results
+            data["title"], pos = text.extract(page, '</a> : ', '</td>', pos)
+            data["date"] , pos = text.extract(page, '<td>', '</td>', pos)
+            data["chapter"] = text.parse_int(url.rpartition("/")[2])
+            results.append((self.root + url, data.copy()))