diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst index 75abcc65..a22434bf 100644 --- a/docs/supportedsites.rst +++ b/docs/supportedsites.rst @@ -44,7 +44,7 @@ Komikcast https://komikcast.com/ Chapters, Manga Konachan https://konachan.com/ Pools, Popular Images, Posts, Tag-Searches Love is Over Archive https://archive.loveisover.me/ Threads Luscious https://luscious.net/ Albums -Manga Fox http://www.mangafox.me/ Chapters +Manga Fox http://fanfox.net/ Chapters Manga Here http://www.mangahere.co/ Chapters, Manga Manga Stream https://mangastream.com/ Chapters Mangapanda http://www.mangapanda.com/ Chapters, Manga @@ -79,23 +79,15 @@ Warosu https://warosu.org/ Threads World Three http://www.slide.world-three.org/ Chapters, Manga XVideos https://www.xvideos.com/ Images from Users, Galleries Yandere https://yande.re/ Pools, Popular Images, Posts, Tag-Searches -YEET Archive https://archive.yeet.net/ Threads Acidimg https://acidimg.cc/ individual Images -Chronos http://chronos.to/ individual Images -Coreimg http://coreimg.net/ individual Images Fapat http://fapat.me/ individual Images -Hosturimage https://hosturimage.com/ individual Images -Imageontime http://imageontime.org/ individual Images Imagetwist https://imagetwist.com/ individual Images Imagevenue http://imagevenue.com/ individual Images -Img4ever https://img4ever.net/ individual Images Imgcandy http://imgcandy.net/ individual Images -Imgmaid https://imgmaid.net/ individual Images Imgspice https://imgspice.com/ individual Images Imgspot http://imgspot.org/ individual Images Imgtrex http://imgtrex.com/ individual Images Imgtrial http://imgtrial.com/ individual Images -Imgupload https://imgupload.yt/ individual Images Imgyt https://img.yt/ individual Images Picmaniac http://pic-maniac.com/ individual Images Pixhost https://pixhost.org/ individual Images diff --git a/gallery_dl/extractor/imagehosts.py b/gallery_dl/extractor/imagehosts.py index 9d14b2ea..aefccdda 100644 --- a/gallery_dl/extractor/imagehosts.py +++ b/gallery_dl/extractor/imagehosts.py @@ -10,7 +10,7 @@ from .common import Extractor, Message from .. import text, exception -from ..cache import cache +from ..cache import memcache from os.path import splitext from urllib.parse import urljoin @@ -126,20 +126,10 @@ class AcidimgImageExtractor(ImgytImageExtractor): test = [] -class ChronosImageExtractor(ImagehostImageExtractor): - """Extractor for single images from chronos.to""" - category = "chronos" - pattern = [r"(?:https?://)?((?:www\.)?chronos\.to/([a-z0-9]{12}))"] - test = [ - ("http://chronos.to/bdrmq7rw7v4y", { - "url": "7fcb3fe315c94283644d25ef47a644c2dc8da944", - "keyword": "04dbc71a1154728d01c931308184050d61c5da55", - "content": "0c8768055e4e20e7c7259608b67799171b691140", - }), - ("http://chronos.to/bdrmq7rw7v4z", { - "exception": exception.NotFoundError, - }), - ] +class PicmaniacImageExtractor(ImagehostImageExtractor): + """Extractor for single images from pic-maniac.com""" + category = "picmaniac" + pattern = [r"(?:https?://)?((?:www\.)?pic-maniac\.com/([a-z0-9]{12}))"] https = False params = "complex" @@ -151,77 +141,6 @@ class ChronosImageExtractor(ImagehostImageExtractor): return url, filename -class CoreimgImageExtractor(ChronosImageExtractor): - """Extractor for single images from coreimg.net""" - category = "coreimg" - pattern = [r"(?:https?://)?((?:www\.)?coreimg\.net/([a-z0-9]{12}))"] - test = [("http://coreimg.net/ykcl5al8uzvg", { - "url": "2b32596a2ea66b7cc784e20f3749f75f20998d78", - "keyword": "8d71e5b820bc7177baee33ca529c91ae4521299f", - "content": "0c8768055e4e20e7c7259608b67799171b691140", - })] - - -class ImgmaidImageExtractor(ChronosImageExtractor): - """Extractor for single images from imgmaid.net""" - category = "imgmaid" - pattern = [r"(?:https?://)?((?:www\.)?imgmaid\.net/([a-z0-9]{12}))"] - test = [] - https = True - - -class PicmaniacImageExtractor(ChronosImageExtractor): - """Extractor for single images from pic-maniac.com""" - category = "picmaniac" - pattern = [r"(?:https?://)?((?:www\.)?pic-maniac\.com/([a-z0-9]{12}))"] - test = [] - - -class HosturimageImageExtractor(ImagehostImageExtractor): - """Extractor for single images from hosturimage.com""" - category = "hosturimage" - pattern = [(r"(?:https?://)?((?:www\.)?hosturimage\.com/" - r"img-([a-z0-9]+)\.html)")] - test = [("https://hosturimage.com/img-581ca97112bf8.html", { - "url": "c672a3fd7fd48e5506d020aa19c4ac91ba078671", - "keyword": "c3c94340b8e395e07b5145cf17534b5871ec8593", - "content": "0c8768055e4e20e7c7259608b67799171b691140", - })] - https = True - - def get_info(self, page): - pos = page.index("