diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst index 8568b61c..2fd1f2c8 100644 --- a/docs/supportedsites.rst +++ b/docs/supportedsites.rst @@ -81,20 +81,13 @@ 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 Acidimg https://acidimg.cc/ individual Images -Fapat http://fapat.me/ individual Images Imagetwist https://imagetwist.com/ individual Images Imagevenue http://imagevenue.com/ individual Images -Imgcandy http://imgcandy.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 Imgyt https://img.yt/ individual Images -Picmaniac http://pic-maniac.com/ individual Images Pixhost https://pixhost.org/ individual Images Postimg https://postimg.org/ individual Images -Rapidimg http://rapidimg.net/ individual Images -Turboimagehost http://turboimagehost.com/ individual Images +Turboimagehost https://turboimagehost.com/ individual Images ==================== =================================== ================================================== ================ .. |http://www.thes-0| replace:: http://www.thespectrum.net/manga_scans/ diff --git a/gallery_dl/extractor/imagehosts.py b/gallery_dl/extractor/imagehosts.py index 372f86e8..3a13256d 100644 --- a/gallery_dl/extractor/imagehosts.py +++ b/gallery_dl/extractor/imagehosts.py @@ -85,40 +85,6 @@ class ImgytImageExtractor(ImagehostImageExtractor): return url, filename -class ImgcandyImageExtractor(ImgytImageExtractor): - """Extractor for single images from imgcandy.net""" - category = "imgcandy" - pattern = [(r"(?:https?://)?((?:www\.)?imgcandy\.net/img-([a-z0-9]+))" - r"(?:_.+)?\.html")] - test = [("http://imgcandy.net/img-57d02527efee8_test.png.html", { - "url": "bc3c9207b10dbfe8e65ccef5b9e3194a7427b4fa", - "keyword": "d3157ff8a33c56a8ec12931a3c098068e5a35cf5", - "content": "0c8768055e4e20e7c7259608b67799171b691140", - })] - https = False - - def __init__(self, match): - ImgytImageExtractor.__init__(self, match) - self.url = "http://" + match.group(1) + ".html" - - -class RapidimgImageExtractor(ImgytImageExtractor): - """Extractor for single images from rapidimg.net""" - category = "rapidimg" - pattern = [r"(?:https?://)?((?:www\.)?rapidimg\.net/" - r"img-([a-z0-9]+)\.html)"] - test = [] - https = False - - -class FapatImageExtractor(ImgytImageExtractor): - """Extractor for single images from fapat.me""" - category = "fapat" - pattern = [r"(?:https?://)?((?:www\.)?fapat\.me/img-([a-z0-9]+)\.html)"] - test = [] - https = False - - class AcidimgImageExtractor(ImgytImageExtractor): """Extractor for single images from acidimg.cc""" category = "acidimg" @@ -126,39 +92,6 @@ class AcidimgImageExtractor(ImgytImageExtractor): test = [] -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" - - def get_info(self, page): - url, pos = text.extract(page, '
', '', '') url , pos = text.extract(page, '.png", { - "url": "c000618bddda42bd599a590b7972c7396d19d8fe", - "keyword": "58905795a9cd3f17d5ff024fc4d63645795ba23c", - "content": "0c8768055e4e20e7c7259608b67799171b691140", - })] - params = None - - def get_info(self, page): - filename, pos = text.extract(page, 'ImgTrex: ', '') - url , pos = text.extract(page, '
\n