diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst index cb9fb201..05109530 100644 --- a/docs/supportedsites.rst +++ b/docs/supportedsites.rst @@ -27,7 +27,6 @@ Doki Reader https://kobato.hologfx.com/reader/ Chapters, Manga Dynasty Reader https://dynasty-scans.com/ Chapters, individual Images, Search Results E-Hentai https://e-hentai.org/ Favorites, Galleries, Search Results Optional e621 https://e621.net/ Pools, Popular Images, Posts, Tag-Searches -EroLord.com http://erolord.com/ Galleries ExHentai https://exhentai.org/ Favorites, Galleries, Search Results Optional Fallen Angels Scans https://www.fascans.com/ Chapters, Manga Fashion Nova https://www.fashionnova.com/ Collections, Products diff --git a/gallery_dl/extractor/__init__.py b/gallery_dl/extractor/__init__.py index 9ff37464..66203fec 100644 --- a/gallery_dl/extractor/__init__.py +++ b/gallery_dl/extractor/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2015-2019 Mike Fährmann +# Copyright 2015-2020 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 @@ -25,7 +25,6 @@ modules = [ "deviantart", "dynastyscans", "e621", - "erolord", "exhentai", "fallenangels", "flickr", diff --git a/gallery_dl/extractor/erolord.py b/gallery_dl/extractor/erolord.py deleted file mode 100644 index 86280392..00000000 --- a/gallery_dl/extractor/erolord.py +++ /dev/null @@ -1,64 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2019 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://erolord.com/""" - -from .common import GalleryExtractor -from .. import text, util -import json - - -class ErolordGalleryExtractor(GalleryExtractor): - """Extractor for image galleries from erolord.com""" - category = "erolord" - root = "http://erolord.com" - pattern = r"(?:https?://)?(?:www\.)?erolord.com(/doujin/(\d+)/?)" - test = ("http://erolord.com/doujin/2189055/", { - "url": "7ce6d10a3934102b95c9718a34ccd3d35f55d85f", - "keyword": { - "title" : "Amazon No Hiyaku | Amazon Elixir", - "gallery_id": 2189055, - "count" : 16, - "artist" : ["Morris"], - "group" : list, - "parody" : list, - "characters": list, - "tags" : list, - "lang" : "en", - "language" : "English", - }, - }) - - def __init__(self, match): - GalleryExtractor.__init__(self, match) - self.gallery_id = match.group(2) - - def metadata(self, page): - extr = text.extract_from(page) - split = text.split_html - title, _, language = extr('