From 832a4a8ee9cb7251270fa1152ebcd5bf0a1d635e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sun, 21 May 2017 10:36:29 +0200 Subject: [PATCH] [fallenangels] add manga extractor --- docs/supportedsites.rst | 2 +- gallery_dl/extractor/fallenangels.py | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst index d5d974b5..c988e2ea 100644 --- a/docs/supportedsites.rst +++ b/docs/supportedsites.rst @@ -23,7 +23,7 @@ Supported Sites +-------------------+---------------------------------------+----------------------------------------------------------+ |ExHentai |https://exhentai.org/ |Galleries | +-------------------+---------------------------------------+----------------------------------------------------------+ -|Fallen Angels Scans|https://fascans.com/ |Chapters | +|Fallen Angels Scans|https://www.fascans.com/ |Chapters, Manga | +-------------------+---------------------------------------+----------------------------------------------------------+ |Gelbooru |https://gelbooru.com/ |Posts, Tag-Searches | +-------------------+---------------------------------------+----------------------------------------------------------+ diff --git a/gallery_dl/extractor/fallenangels.py b/gallery_dl/extractor/fallenangels.py index e82e3cf2..8dae0675 100644 --- a/gallery_dl/extractor/fallenangels.py +++ b/gallery_dl/extractor/fallenangels.py @@ -6,10 +6,11 @@ # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. -"""Extract manga-chapters from https://fascans.com/""" +"""Extract manga-chapters from https://www.fascans.com/""" -from .common import Extractor, Message +from .common import Extractor, MangaExtractor, Message from .. import text, util +import re import json @@ -66,3 +67,22 @@ class FallenangelsChapterExtractor(Extractor): def get_images(page): """Return a list of all images in this chapter""" return json.loads(text.extract(page, "var pages = ", ";")[0]) + + +class FallenangelsMangaExtractor(MangaExtractor): + """Extractor for manga from fascans.com""" + category = "fallenangels" + pattern = [r"(?:https?://)?((manga|truyen)\.fascans\.com/manga/[^/]+)/?$"] + scheme = "https" + test = [ + ("http://manga.fascans.com/manga/trinity-seven", { + "url": "8da3d4bcbadc173e5b23c141a0e646b35f41b9b0", + }), + ("https://truyen.fascans.com/manga/rakudai-kishi-no-eiyuutan", { + "url": "d332d08ce522c7943cd80d3fd361391190444a26", + }), + ] + + def chapters(self, page): + pattern = r'

\s+