[fallenangels] extract manga metadata

gallery_dl/extractor/fallenangels.py

@@ -10,7 +10,6 @@
 
 from .common import Extractor, MangaExtractor, Message
 from .. import text, util
-import re
 import json
 
 
@@ -18,24 +17,29 @@ class FallenangelsChapterExtractor(Extractor):
     """Extractor for manga-chapters from fascans.com"""
     category = "fallenangels"
     subcategory = "chapter"
-    directory_fmt = ["{category}", "{manga}", "{chapter:>03} - {title}"]
+    directory_fmt = ["{category}", "{manga}",
-    filename_fmt = "{manga}_{chapter:>03}_{page:>03}.{extension}"
+                     "c{chapter:>03}{chapter_minor} - {title}"]
+    filename_fmt = ("{manga}_c{chapter:>03}{chapter_minor}_"
+                    "{page:>03}.{extension}")
     pattern = [(r"(?:https?://)?(manga|truyen)\.fascans\.com/"
-                r"manga/([^/]+)/(\d+)")]
+                r"manga/([^/]+)/(\d+)(\.[^/?&#]+)?")]
     test = [
         ("https://manga.fascans.com/manga/chronos-ruler/20/1", {
             "url": "4604a7914566cc2da0ff789aa178e2d1c8c241e3",
-            "keyword": "b2b9c7fd4696b9369d230c3069b5333b476f35d6",
+            "keyword": "4e1722cf0ed8ee5fc5c64147ac3f39342e767cd8",
         }),
         ("http://truyen.fascans.com/manga/hungry-marie/8", {
             "url": "1f923d9cb337d5e7bbf4323719881794a951c6ae",
-            "keyword": "5520691dbaa26248bcd994e6c6a87bb39710f6c3",
+            "keyword": "c7beeb7d8a65d5d8ab451f076f584bd4d52b7210",
+        }),
+        ("http://manga.fascans.com/manga/rakudai-kishi-no-eiyuutan/19.5", {
+            "keyword": "bf7dd1c462a80ffe50b92fec00b7acda2f8b800e",
         }),
     ]
 
     def __init__(self, match):
         Extractor.__init__(self)
-        self.version, self.manga, self.chapter = match.groups()
+        self.version, self.manga, self.chapter, self.minor = match.groups()
 
     def items(self):
         url = "https://{}.fascans.com/manga/{}/{}/1".format(
@@ -55,6 +59,7 @@ class FallenangelsChapterExtractor(Extractor):
         lang = "vi" if self.version == "truyen" else "en"
         data = {
             "chapter": self.chapter,
+            "chapter_minor": self.minor or "",
             "lang": lang,
             "language": util.code_to_language(lang),
         }
@@ -76,13 +81,36 @@ class FallenangelsMangaExtractor(MangaExtractor):
     scheme = "https"
     test = [
         ("http://manga.fascans.com/manga/trinity-seven", {
-            "url": "8f8373d645e6702b7b692bac3c04bd6e4c562af1",
+            "url": "17acbfb97fcad16fea32009ec580b7e5931313a3",
+            "keyword": "707975dfb95855c8cba2e18a7405a77444c9280b",
         }),
         ("https://truyen.fascans.com/manga/rakudai-kishi-no-eiyuutan", {
             "url": "51a731a6b82d5eb7a335fbae6b02d06aeb2ab07b",
+            "keyword": "2d2a2a5d9ea5925eb9a47bb13d848967f3af086c",
         }),
     ]
 
+    def __init__(self, match):
+        MangaExtractor.__init__(self, match)
+        self.lang = "vi" if match.group(2) == "truyen" else "en"
+
     def chapters(self, page):
-        pattern = r'<h\d class="chapter-title-rtl">\s+<a href="([^"]+)"'
+        language = util.code_to_language(self.lang)
-        return re.findall(pattern, page)
+        results = []
+        pos = 0
+        while True:
+            test, pos = text.extract(page, '<li style="', '', pos)
+            if test is None:
+                return results
+            volume , pos = text.extract(page, 'class="volume-', '"', pos)
+            url    , pos = text.extract(page, 'href="', '"', pos)
+            chapter, pos = text.extract(page, '>', '<', pos)
+            title  , pos = text.extract(page, '<em>', '</em>', pos)
+
+            manga, _, chapter = chapter.rpartition(" ")
+            chapter, _, minor = chapter.partition(".")
+            results.append((url, {
+                "manga": manga, "title": title, "volume": int(volume),
+                "chapter": int(chapter), "chapter_minor": minor,
+                "lang": self.lang, "language": language,
+            }))

gallery_dl/extractor/khinsider.py

@@ -21,7 +21,8 @@ class KhinsiderSoundtrackExtractor(AsynchronousExtractor):
                r"game-soundtracks/album/(.+)"]
     test = [(("http://downloads.khinsider.com/game-soundtracks/"
               "album/horizon-riders-wii-"), {
-        "url": "732639e9e72e169f8ec36a71609471aaf67451e0",
+        "pattern": ("https?://\d+\.\d+\.\d+\.\d+/ost/horizon-riders-wii-/"
+                    "[^/]+/horizon-riders-wii-full-soundtrack\.mp3"),
         "keyword": "d91cf3edee6713b536eaf3995743f0be7dc72f68",
     })]
 

test/test_extractors.py

@@ -66,9 +66,9 @@ skip = [
     "exhentai", "kissmanga", "mangafox", "dynastyscans", "nijie",
     "archivedmoe", "archiveofsins", "thebarchive",
     # temporary issues
-    "luscious",  # "high load"
     "imgtrex",  # 504
     "hentaifoundry",  # SSL cert expired
+    "pawoo",
 ]
 # enable selective testing for direct calls
 if __name__ == '__main__' and len(sys.argv) > 1: