improved foolslide-based extractors

- this includes dokireader, fallenangels, jaiminisbox, powermanga,
  sensescans, worldthree, yonkouprod, gomanga, yomanga
- added 'chapter_string', 'chapter_id', 'chapter_minor' and 'count'
  keywords
- changed the 'chapter' keyword to always be just a number
- changed the default directory format

gallery_dl/extractor/powermanga.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2015, 2016 Mike Fährmann
+# Copyright 2015-2017 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
@@ -8,31 +8,14 @@
 
 """Extract manga-chapters from http://powermanga.org/"""
 
-from .foolslide import FoolslideChapterExtractor
-from .. import text
-import re
+from . import foolslide
 
 
-class PowermangaChapterExtractor(FoolslideChapterExtractor):
+class PowermangaChapterExtractor(foolslide.FoolslideChapterExtractor):
     """Extractor for manga-chapters from powermanga.org"""
     category = "powermanga"
-    pattern = [
-        (r"(?:https?://)?read(?:er)?\.powermanga\.org/read/"
-         r"(.+/([a-z]{2})/\d+/\d+)(?:/page)?"),
-        (r"(?:https?://)?(?:www\.)?(p)owermanga\.org/((?:[^-]+-)+[^-]+/?)"),
-    ]
+    pattern = foolslide.chapter_pattern(r"read(?:er)?\.powermanga\.org")
     test = [("https://read.powermanga.org/read/one_piece/en/0/803/page/1", {
         "url": "e6179c1565068f99180620281f86bdd25be166b4",
-        "keyword": "51cabad8995727334e5ca9773c18d709b3868f02",
+        "keyword": "203ea5d0ef7759f4517316f0678f3592fc27cdbe",
     })]
-
-    def __init__(self, match):
-        if match.group(1) == "p":
-            url = "https://powermanga.org/" + match.group(2)
-            page = self.request(url).text
-            pos = page.index("class='small-button smallblack'>Download</a>")
-            url = text.extract(page, "<a href='", "'", pos)[0]
-            match = re.match(self.pattern[0], url)
-        extra = "er" if "://reader" in match.string else ""
-        url = "https://read" + extra + ".powermanga.org/read/" + match.group(1)
-        FoolslideChapterExtractor.__init__(self, url, match.group(2))