From cc0b4f266126114c755a97ba4d6bc2a8a3b1211f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Fri, 13 Jan 2017 00:03:12 +0100 Subject: [PATCH] [yomanga] add chapter extractor --- README.rst | 8 ++++---- gallery_dl/extractor/__init__.py | 1 + gallery_dl/extractor/common.py | 6 ------ gallery_dl/extractor/yomanga.py | 26 ++++++++++++++++++++++++++ test/test_extractors.py | 2 +- 5 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 gallery_dl/extractor/yomanga.py diff --git a/README.rst b/README.rst index f05367f0..342bf87b 100644 --- a/README.rst +++ b/README.rst @@ -49,10 +49,10 @@ Supported Sites rule34.xxx, safebooru.org, chan.sankakucomplex.com, yande.re * Manga: bato.to, dynasty-scans.com, kissmanga.com, kobato.hologfx.com, - mangahere.co, mangamint.com, mangapanda.com, mangapark.me, mangareader.net, - mangashare.com, mangastream.com, powermanga.org, raw.senmanga.com, - reader.sensescans.com, thespectrum.net, slide.world-three.org, - yonkouprod.com + gomanga.co, mangahere.co, mangamint.com, mangapanda.com, mangapark.me, + mangareader.net, mangashare.com, mangastream.com, powermanga.org, + raw.senmanga.com, reader.sensescans.com, thespectrum.net, + slide.world-three.org, yomanga.co, yonkouprod.com * Comic: kisscomic.us, readcomiconline.to, readcomics.tv * Hentai: diff --git a/gallery_dl/extractor/__init__.py b/gallery_dl/extractor/__init__.py index 8d7121b1..48b759c1 100644 --- a/gallery_dl/extractor/__init__.py +++ b/gallery_dl/extractor/__init__.py @@ -67,6 +67,7 @@ modules = [ "whentai", "worldthree", "yandere", + "yomanga", "yonkouprod", "imagehosts", "recursive", diff --git a/gallery_dl/extractor/common.py b/gallery_dl/extractor/common.py index f0c3ca5e..2a5a762d 100644 --- a/gallery_dl/extractor/common.py +++ b/gallery_dl/extractor/common.py @@ -10,14 +10,11 @@ import time import queue -import logging import requests import threading from .message import Message from .. import config -log = logging.getLogger(__name__) - class Extractor(): @@ -96,7 +93,4 @@ def safe_request(session, url, method="GET", *args, **kwargs): continue # everything ok -- proceed to download - log.debug(url) - log.debug(r.headers) - log.debug(r.text) return r diff --git a/gallery_dl/extractor/yomanga.py b/gallery_dl/extractor/yomanga.py new file mode 100644 index 00000000..4a86a9a5 --- /dev/null +++ b/gallery_dl/extractor/yomanga.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- + +# Copyright 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 +# published by the Free Software Foundation. + +"""Extract manga-chapters from https://yomanga.co/""" + +from .foolslide import FoolslideChapterExtractor + +class YomangaChapterExtractor(FoolslideChapterExtractor): + """Extractor for manga-chapters from yomanga.co""" + category = "yomanga" + pattern = [(r"(?:https?://)?(?:www\.)?(yomanga\.co/reader/read/" + r"[^/]+/([a-z]{2})/\d+/\d+)")] + test = [("https://yomanga.co/reader/read/uwakoi/en/0/2/", { + "url": "4b5d8fc5902f03647cc876cf6643849e5bc05455", + "keyword": "1b9ac4217146421dbcb2a1108693054c56554a9d", + })] + single = False + + def __init__(self, match): + url = "https://" + match.group(1) + FoolslideChapterExtractor.__init__(self, url, match.group(2)) diff --git a/test/test_extractors.py b/test/test_extractors.py index 2f829906..5b417294 100644 --- a/test/test_extractors.py +++ b/test/test_extractors.py @@ -55,7 +55,7 @@ if __name__ == '__main__' and len(sys.argv) > 1: ] del sys.argv[1:] -skip = [] +skip = ["exhentai", "kissmanga"] for extr in extractors: if extr.category in skip: continue