diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst index e16cd69b..86deecdb 100644 --- a/docs/supportedsites.rst +++ b/docs/supportedsites.rst @@ -49,7 +49,6 @@ Manga Stream https://mangastream.com/ Chapters Mangapanda http://www.mangapanda.com/ Chapters, Manga MangaPark http://mangapark.me/ Chapters, Manga Mangareader http://www.mangareader.net/ Chapters, Manga -Mangazuki https://mangazuki.co/ Chapters, Manga nhentai https://nhentai.net/ Galleries Niconico Seiga http://seiga.nicovideo.jp Images from Users, individual Images Required nijie https://nijie.info/ Images from Users, individual Images Required diff --git a/gallery_dl/extractor/__init__.py b/gallery_dl/extractor/__init__.py index 05b7047f..84b94e44 100644 --- a/gallery_dl/extractor/__init__.py +++ b/gallery_dl/extractor/__init__.py @@ -56,7 +56,6 @@ modules = [ "mangapark", "mangareader", "mangastream", - "mangazuki", "nhentai", "nijie", "nyafuu", diff --git a/gallery_dl/extractor/mangazuki.py b/gallery_dl/extractor/mangazuki.py deleted file mode 100644 index 3f0bcbf0..00000000 --- a/gallery_dl/extractor/mangazuki.py +++ /dev/null @@ -1,114 +0,0 @@ -# -*- 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 and entire manga from https://mangazuki.co/""" - -from .common import Extractor, MangaExtractor, Message -from .. import text, util, exception - - -class MangazukiChapterExtractor(Extractor): - """Extractor for manga-chapters from mangazuki.co""" - category = "mangazuki" - subcategory = "chapter" - directory_fmt = ["{category}", "{manga}", "c{chapter:>03}"] - filename_fmt = ("{manga}_c{chapter:>03}_{page:>03}.{extension}") - pattern = [r"(?:https?://)?((raws\.)?mangazuki\.co/read/[^/]+/\d+)"] - test = [ - ("https://mangazuki.co/read/Double-Casting/59", { - "url": "47b4102da3ee1bd28459848904e8b7ff48e1ac5e", - "keyword": "b4cac50b3a3a1dd06451d1917a0faae2c6a51b95", - }), - ("https://raws.mangazuki.co/read/Rakujitsu-no-Pathos/25", { - "url": "c1c95d9954185f53a8449f497239aee181bea4af", - "keyword": "7554ca641f10e84fa5594e5ff8bd3925a5ff2e80", - }), - ("https://mangazuki.co/read/Double-Casting/999", { - "exception": exception.NotFoundError, - }), - ] - - def __init__(self, match): - Extractor.__init__(self) - self.url = "https://" + match.group(1) - self.lang = "" if match.group(2) else "en" - - def items(self): - response = self.request(self.url) - if response.history: - raise exception.NotFoundError("chapter") - page = response.text - data = self.get_metadata(page) - imgs = self.get_images(page) - data["count"] = len(imgs) - - yield Message.Version, 1 - yield Message.Directory, data - for data["page"], url in enumerate(imgs, 1): - yield Message.Url, url, text.nameext_from_url(url, data) - - def get_metadata(self, page): - """Collect metadata for extractor-job""" - data = { - "lang": self.lang, - "language": util.code_to_language(self.lang, self.lang), - } - return text.extract_all(page, ( - (None , "Mangazuki", ""), - ("manga" , " - ", " - Chapter "), - ("chapter", "", ""), - ), values=data)[0] - - @staticmethod - def get_images(page): - """Return a list of all image-urls""" - return list(text.extract_iter(page, 'data-src="', '"')) - - -class MangazukiMangaExtractor(MangaExtractor): - """Extractor for manga from mangazuki.co""" - category = "mangazuki" - pattern = [r"(?:https?://)?((raws\.)?mangazuki\.co/series/[^/?&#]+)"] - scheme = "https" - test = [ - ("https://mangazuki.co/series/Double-Casting", { - "url": "aab747414191b14e768f4a1eb148448d83ef2e14", - "keyword": "99e64728381e110379703ef28511b45c1c850f86", - }), - ("https://raws.mangazuki.co/series/Hyulla-s-Clan", { - "url": "56ab020798c7a7b5b717166fe999455801a84f25", - "keyword": "9067b2f614d45f399240a93cb9a187ccb25ebde2", - }), - ] - - def __init__(self, match): - MangaExtractor.__init__(self, match) - self.lang = "" if match.group(2) else "en" - - def chapters(self, page): - params = {"page": 1} - results = [] - manga = text.extract( - page, ' 1: