diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst index 2fd1f2c8..e796e1c8 100644 --- a/docs/supportedsites.rst +++ b/docs/supportedsites.rst @@ -33,7 +33,6 @@ Idol Complex https://idol.sankakucomplex.com/ Pools, Posts, Tag-Searc ImageBam http://www.imagebam.com/ Galleries, individual Images ImageFap http://imagefap.com/ Images from Users, Galleries, individual Images imgbox https://imgbox.com/ Galleries, individual Images -imgChili https://imgchili.net/ Albums, individual Images imgth https://imgth.com/ Galleries imgur https://imgur.com/ Albums, individual Images Jaimini's Box https://jaiminisbox.com/ Chapters, Manga diff --git a/gallery_dl/extractor/__init__.py b/gallery_dl/extractor/__init__.py index b1b97d00..fbe614e5 100644 --- a/gallery_dl/extractor/__init__.py +++ b/gallery_dl/extractor/__init__.py @@ -40,7 +40,6 @@ modules = [ "imagebam", "imagefap", "imgbox", - "imgchili", "imgth", "imgur", "jaiminisbox", diff --git a/gallery_dl/extractor/imgchili.py b/gallery_dl/extractor/imgchili.py deleted file mode 100644 index 15663025..00000000 --- a/gallery_dl/extractor/imgchili.py +++ /dev/null @@ -1,101 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2014-2018 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 https://imgchili.net/""" - -from .common import Extractor, Message -from .. import text - - -class ImgchiliExtractor(Extractor): - """Base class for imgchili extractors""" - category = "imgchili" - root = "https://imgchili.net" - - def __init__(self, match): - Extractor.__init__(self) - self.url = match.group(0) - self.match = match - self.session.headers["Referer"] = self.root - - def items(self): - page = self.request(self.url, encoding="utf-8").text - data = self.get_job_metadata(page) - yield Message.Version, 1 - yield Message.Directory, data - for url, image in self.get_images(page): - data.update(image) - yield Message.Url, url, data - - def get_job_metadata(self, page): - """Collect metadata for extractor-job""" - return {} - - def get_images(self, page): - """Collect image-urls and -metadata""" - return [] - - -class ImgchiliImageExtractor(ImgchiliExtractor): - """Extractor for single images from imgchili.net""" - subcategory = "image" - archive_fmt = "{image_id}" - pattern = [r"(?:https?://)?(?:www\.)?imgchili\.net/show/\d+/(\d+)_[^/]+"] - test = [(("http://imgchili.net/show/89427/" - "89427136_test___quot;___gt;.png"), { - "url": "b93d92a6b58eb30a7ff6f9729cb748d25fea0c86", - "keyword": "9c584f848766e4cc71d9e7f5f1f849e296ec05ae", - })] - - def get_job_metadata(self, page): - name1, pos = text.extract(page, '="description" content="', '. An ') - name2, pos = text.extract(page, 'image called ', '" />\n', pos) - _ , pos = text.extract(page, ' 1 else "" - }) - - def get_images(self, page): - return [(self.imgurl, {})] - - -class ImgchiliAlbumExtractor(ImgchiliExtractor): - """Extractor for image-albums from imgchili.net""" - subcategory = "album" - directory_fmt = ["{category}", "{title} - {album_id}"] - archive_fmt = "{album_id}_{image_id}" - filename_fmt = "{num:>03} {filename}" - pattern = [r"(?:https?://)?(?:www\.)?imgchili\.net/album/([^/]+)"] - test = [("http://imgchili.net/album/7a3824c59f77c8d39b260f9168d4b49b", { - "url": "995e32b62c36d48b02ef4c7a7a19463924391e2a", - "keyword": "14e903b320702faae0f057af910f2fa04ef2ad66", - })] - - def get_job_metadata(self, page): - title = text.extract(page, "