From 96baea095960ae481cee61752750131fbf1f74f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sat, 18 Feb 2017 12:34:10 +0100 Subject: [PATCH] [hentaibox] remove extractor --- gallery_dl/extractor/__init__.py | 1 - gallery_dl/extractor/hentaibox.py | 59 ------------------------------- supportedsites.rst | 1 - test/test_extractors.py | 2 +- 4 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 gallery_dl/extractor/hentaibox.py diff --git a/gallery_dl/extractor/__init__.py b/gallery_dl/extractor/__init__.py index d530e3fa..952ed46c 100644 --- a/gallery_dl/extractor/__init__.py +++ b/gallery_dl/extractor/__init__.py @@ -26,7 +26,6 @@ modules = [ "gomanga", "hbrowse", "hentai2read", - "hentaibox", "hentaifoundry", "hentaihere", "hitomi", diff --git a/gallery_dl/extractor/hentaibox.py b/gallery_dl/extractor/hentaibox.py deleted file mode 100644 index b721f807..00000000 --- a/gallery_dl/extractor/hentaibox.py +++ /dev/null @@ -1,59 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2016 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 images from http://www.hentaibox.net/""" - -from .common import Extractor, Message -from .. import text, iso639_1 - - -class HentaiboxChapterExtractor(Extractor): - """Extractor for a single manga chapter from hentaibox.net""" - category = "hentaibox" - subcategory = "chapter" - directory_fmt = ["{category}", "{series}", "{title}"] - filename_fmt = "{num:>03}.{extension}" - pattern = [r"(?:https?://)?(?:www\.)?hentaibox\.net/" - r"[^/]+/(\d+)_\d+_([^/&]+)"] - test = [(("http://www.hentaibox.net/hentai-manga/" - "16_18_Original_Amazon-No-Hiyaku-Amazon-Elixir-Decensored"), { - "url": "d1a50a9b289d284f178971e01cf312791888e057", - "keyword": "b4b100f800b716e573e072f01b5d604d9b436b70", - })] - - def __init__(self, match): - Extractor.__init__(self) - self.url = match.group(0) - self.count = match.group(1) - - def items(self): - page = self.request(self.url + "&slideshow=play").text - data = self.get_job_metadata(page) - yield Message.Version, 1 - yield Message.Directory, data - for num, url in enumerate(self.get_image_urls(page), 1): - data["num"] = num - data["extension"] = url[url.rfind(".")+1:] - yield Message.Url, url, data - - def get_job_metadata(self, page): - """Collect metadata for extractor-job""" - data = text.extract_all(page, ( - ("title" , 'content="Read or Download ', ' hentai manga from'), - ("series" , ' the series ', ' with ' + self.count), - ("language", ' translated pages to ', '.'), - ), values={"count": self.count})[0] - data["lang"] = iso639_1.language_to_code(data["language"]) - return data - - @staticmethod - def get_image_urls(page): - """Extract and return a list of all image-urls""" - yield from text.extract_iter( - page, '', '' - ) diff --git a/supportedsites.rst b/supportedsites.rst index d5c02f0c..9d48c1fd 100644 --- a/supportedsites.rst +++ b/supportedsites.rst @@ -18,7 +18,6 @@ Supported Sites - gomanga.co - hbrowse.com - hentai2read.com -- hentaibox.net - hentaifoundry.com - hentaihere.com - hitomi.la diff --git a/test/test_extractors.py b/test/test_extractors.py index 8d4cec93..c5e7ca17 100644 --- a/test/test_extractors.py +++ b/test/test_extractors.py @@ -48,7 +48,7 @@ def _generate_test(extr, tcase): # enable selective testing for direct calls -skip = ["exhentai", "kissmanga", "mangafox", "yomanga"] +skip = ["exhentai", "kissmanga", "mangafox"] if __name__ == '__main__' and len(sys.argv) > 1: extractors = [ extr for extr in extractor.extractors()