From 2b93fdba7c0606e385b37826e9a8a37c64548f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Fri, 27 Nov 2015 21:31:17 +0100 Subject: [PATCH] [kissmanga] unify extractor metadata in base class --- gallery_dl/extractor/kissmanga.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/gallery_dl/extractor/kissmanga.py b/gallery_dl/extractor/kissmanga.py index 93caa84c..2ec80354 100644 --- a/gallery_dl/extractor/kissmanga.py +++ b/gallery_dl/extractor/kissmanga.py @@ -12,18 +12,22 @@ from .common import Extractor, Message from .. import text, cloudflare import re -class KissmangaMangaExtractor(Extractor): +class KissmangaExtractor(Extractor): category = "kissmanga" directory_fmt = ["{category}", "{manga}", "c{chapter:>03}{chapter-minor} - {title}"] filename_fmt = "{manga}_c{chapter:>03}{chapter-minor}_{page:>03}.{extension}" - pattern = [r"(?:https?://)?(?:www\.)?kissmanga\.com/Manga/[^/]+/?$"] url_base = "http://kissmanga.com" def __init__(self, match): Extractor.__init__(self) self.url = match.group(0) + +class KissmangaMangaExtractor(KissmangaExtractor): + + pattern = [r"(?:https?://)?(?:www\.)?kissmanga\.com/Manga/[^/]+/?$"] + def items(self): cloudflare.bypass_ddos_protection(self.session, self.url_base) yield Message.Version, 1 @@ -43,17 +47,10 @@ class KissmangaMangaExtractor(Extractor): chapters.append(url) -class KissmangaChapterExtractor(Extractor): +class KissmangaChapterExtractor(KissmangaExtractor): - category = "kissmanga" - directory_fmt = ["{category}", "{manga}", "c{chapter:>03}{chapter-minor} - {title}"] - filename_fmt = "{manga}_c{chapter:>03}{chapter-minor}_{page:>03}.{extension}" pattern = [r"(?:https?://)?(?:www\.)?kissmanga\.com/Manga/.+/.+\?id=\d+"] - def __init__(self, match): - Extractor.__init__(self) - self.url = match.group(0) - def items(self): cloudflare.bypass_ddos_protection(self.session, "http://kissmanga.com") page = self.request(self.url).text