diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst index e1533c96..e55ba8b9 100644 --- a/docs/supportedsites.rst +++ b/docs/supportedsites.rst @@ -10,17 +10,17 @@ Site URL Capabilities arch.b4k.co https://arch.b4k.co/ Threads Archive of Sins https://archiveofsins.com/ Threads Archived.Moe https://archived.moe/ Threads -ArtStation https://www.artstation.com/ |Images from Use-1| +ArtStation https://www.artstation.com/ |Images from Use-0| Danbooru https://danbooru.donmai.us/ Pools, Popular Images, Posts, Tag-Searches Desuarchive https://desuarchive.org/ Threads -DeviantArt https://www.deviantart.com/ |Collections, De-2| Optional (OAuth) +DeviantArt https://www.deviantart.com/ |Collections, De-1| Optional (OAuth) Doki Reader https://kobato.hologfx.com/ Chapters, Manga Dynasty Reader https://dynasty-scans.com/ Chapters e621 https://e621.net/ Pools, Popular Images, Posts, Tag-Searches ExHentai https://exhentai.org/ Favorites, Galleries, Search Results Optional Fallen Angels Scans https://www.fascans.com/ Chapters, Manga Fireden https://boards.fireden.net/ Threads -Flickr https://www.flickr.com/ |Images from Use-3| Optional (OAuth) +Flickr https://www.flickr.com/ |Images from Use-2| Optional (OAuth) Futaba Channel https://www.2chan.net/ Threads Gelbooru https://gelbooru.com/ Pools, Posts, Tag-Searches Gfycat https://gfycat.com/ individual Images @@ -42,7 +42,6 @@ Kirei Cake https://reader.kireicake.com/ Chapters, Manga KissManga http://kissmanga.com/ Chapters, Manga 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://fanfox.net/ Chapters Manga Here http://www.mangahere.co/ Chapters, Manga @@ -53,11 +52,11 @@ MangaPark https://mangapark.me/ Chapters, Manga Mangareader https://www.mangareader.net/ Chapters, Manga nhentai https://nhentai.net/ Galleries, Search Results Niconico Seiga http://seiga.nicovideo.jp Images from Users, individual Images Required -nijie https://nijie.info/ |Images from Use-4| Required +nijie https://nijie.info/ |Images from Use-3| Required Nyafuu Archive https://archive.nyafuu.org/ Threads Pawoo https://pawoo.net Images from Users, Images from Statuses Pinterest https://www.pinterest.com Boards, Pins, pin.it Links -Pixiv https://www.pixiv.net/ |Images from Use-5| Required +Pixiv https://www.pixiv.net/ |Images from Use-4| Required PowerManga https://powermanga.org/ Chapters, Manga Pure Mashiro http://reader.puremashiro.moe/ Chapters, Manga Read Comic Online http://readcomiconline.to/ Comic-Issues, Comics @@ -71,7 +70,6 @@ Sea Otter Scans https://reader.seaotterscans.com/ Chapters, Manga Sen Manga http://raw.senmanga.com/ Chapters Sense-Scans http://sensescans.com/ Chapters, Manga SlideShare https://www.slideshare.net/ Presentations -Spectrum Nexus |http://www.thes-0| Chapters, Manga Subapics https://subapics.com/ Chapters, Manga The /b/ Archive https://thebarchive.com/ Threads Tumblr https://www.tumblr.com/ Images from Users, Likes, Posts, Tag-Searches Optional (OAuth) @@ -90,9 +88,8 @@ Postimg https://postimg.org/ individual Images Turboimagehost https://turboimagehost.com/ individual Images ==================== =================================== ================================================== ================ -.. |http://www.thes-0| replace:: http://www.thespectrum.net/manga_scans/ -.. |Images from Use-1| replace:: Images from Users, Albums, Challenges, individual Images, Likes, Search Results -.. |Collections, De-2| replace:: Collections, Deviations, Favorites, Folders, Galleries, Journals -.. |Images from Use-3| replace:: Images from Users, Albums, Favorites, Galleries, Groups, individual Images, Search Results -.. |Images from Use-4| replace:: Images from Users, Doujin, Favorites, individual Images -.. |Images from Use-5| replace:: Images from Users, Bookmarks, Favorites, pixiv.me Links, Rankings, Individual Images +.. |Images from Use-0| replace:: Images from Users, Albums, Challenges, individual Images, Likes, Search Results +.. |Collections, De-1| replace:: Collections, Deviations, Favorites, Folders, Galleries, Journals +.. |Images from Use-2| replace:: Images from Users, Albums, Favorites, Galleries, Groups, individual Images, Search Results +.. |Images from Use-3| replace:: Images from Users, Doujin, Favorites, individual Images +.. |Images from Use-4| replace:: Images from Users, Bookmarks, Favorites, pixiv.me Links, Rankings, Individual Images diff --git a/gallery_dl/extractor/__init__.py b/gallery_dl/extractor/__init__.py index d460e482..1a9c28c3 100644 --- a/gallery_dl/extractor/__init__.py +++ b/gallery_dl/extractor/__init__.py @@ -77,7 +77,6 @@ modules = [ "senmanga", "sensescans", "slideshare", - "spectrumnexus", "subapics", "thebarchive", "tumblr", diff --git a/gallery_dl/extractor/spectrumnexus.py b/gallery_dl/extractor/spectrumnexus.py deleted file mode 100644 index 8bc2aa1c..00000000 --- a/gallery_dl/extractor/spectrumnexus.py +++ /dev/null @@ -1,74 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2015-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 manga pages from http://www.thespectrum.net/manga_scans/""" - -from .common import ChapterExtractor, MangaExtractor -from .. import text, util - - -class SpectrumnexusMangaExtractor(MangaExtractor): - """Extractor for manga from thespectrum.net""" - category = "spectrumnexus" - pattern = [r"(?:https?://)?(view\.thespectrum\.net/series/[^.]+\.html)#?$"] - reverse = False - test = [("http://view.thespectrum.net/series/kare-kano-volume-01.html", { - "url": "b2b175aad5ef1701cc4aee7c24f1ca3a93aba9cb", - "keyword": "5ed9d5c7c69d2d03417c853c4e8eae30f1e5febf", - })] - - def chapters(self, page): - results = [] - manga = text.extract(page, '', ' · ')[0] - page = text.extract(page, 'class="selectchapter"', '</select>')[0] - for chapter in text.extract_iter(page, '<option value="', '"'): - results.append((self.url + "?ch=" + chapter.replace(" ", "+"), { - "manga": manga, "chapter_string": chapter, - })) - return results - - -class SpectrumnexusChapterExtractor(ChapterExtractor): - """Extractor for manga-chapters or -volumes from thespectrum.net""" - category = "spectrumnexus" - directory_fmt = ["{category}", "{manga}", "{chapter_string}"] - filename_fmt = "{manga}_{chapter_string}_{page:>03}.{extension}" - archive_fmt = "{manga}_{chapter_string}_{page}" - pattern = [r"(?:https?://)?view\.thespectrum\.net/series/" - r"([^\.]+\.html)\?ch=(Chapter\+(\d+)|Volume\+(\d+))"] - test = [(("http://view.thespectrum.net/series/" - "toriko.html?ch=Chapter+343&page=1"), { - "url": "c0fc7dc594841217cc622a67edd79f06e9900333", - "keyword": "a8abe126cbc5fc798148b0b155242a470c1ba9d1", - })] - - def __init__(self, match): - path, self.chapter_string, self.chapter, self.volume = match.groups() - url = "http://view.thespectrum.net/series/{}?ch={}".format( - path, self.chapter_string) - ChapterExtractor.__init__(self, url) - - def get_metadata(self, page): - data = { - "chapter": util.safe_int(self.chapter), - "chapter_string": self.chapter_string.replace("+", " "), - "volume": util.safe_int(self.volume), - } - data = text.extract_all(page, ( - ('manga', '<title>', ' · SPECTRUM NEXUS '), - ('count', '
of ', '<'), - ), values=data)[0] - data["count"] = util.safe_int(data["count"]) - return data - - def get_images(self, page): - params = {"page": 1} - while True: - yield text.extract(page, '