diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst index 18366500..36ff1da3 100644 --- a/docs/supportedsites.rst +++ b/docs/supportedsites.rst @@ -17,7 +17,7 @@ BobX http://www.bobx.com/dark/ Galleries, Idols Danbooru https://danbooru.donmai.us/ Pools, Popular Images, Posts, Tag-Searches Optional Desuarchive https://desuarchive.org/ Threads DeviantArt https://www.deviantart.com/ |Capabilities-1| Optional (OAuth) -Doki Reader https://kobato.hologfx.com/ Chapters, Manga +Doki Reader https://kobato.hologfx.com/reader/ 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 @@ -45,13 +45,13 @@ Jaimini's Box https://jaiminisbox.com/ Chapters, Manga Joyreactor http://joyreactor.cc/ |Capabilities-4| Khinsider https://downloads.khinsider.com/ Soundtracks Kirei Cake https://reader.kireicake.com/ Chapters, Manga -KissManga http://kissmanga.com/ Chapters, Manga +KissManga https://kissmanga.com/ Chapters, Manga Komikcast https://komikcast.com/ Chapters, Manga Konachan https://konachan.com/ Pools, Popular Images, Posts, Tag-Searches Luscious https://luscious.net/ Albums, Search Results Optional -Manga Fox http://fanfox.net/ Chapters -Manga Here http://www.mangahere.co/ Chapters, Manga -Manga Stream https://mangastream.com/ Chapters +Manga Fox https://fanfox.net/ Chapters +Manga Here https://www.mangahere.cc/ Chapters, Manga +Manga Stream https://readms.net/ Chapters MangaDex https://mangadex.org/ Chapters, Manga Mangapanda https://www.mangapanda.com/ Chapters, Manga MangaPark https://mangapark.me/ Chapters, Manga @@ -59,19 +59,19 @@ Mangareader https://www.mangareader.net/ Chapters, Manga Newgrounds https://www.newgrounds.com/ Images from Users, individual Images, Videos Ngomik http://ngomik.in/ Chapters nhentai https://nhentai.net/ Galleries, Search Results -Niconico Seiga http://seiga.nicovideo.jp Images from Users, individual Images Required +Niconico Seiga http://seiga.nicovideo.jp/ Images from Users, individual Images Required nijie https://nijie.info/ |Capabilities-5| Required Nyafuu Archive https://archive.nyafuu.org/ Threads Pawoo https://pawoo.net/ Images from Users, Images from Statuses Photobucket http://photobucket.com/ Albums, individual Images Piczel https://piczel.tv/ Images from Users, Folders, individual Images -Pinterest https://www.pinterest.com Boards, Pins, pin.it Links, related Pins +Pinterest https://www.pinterest.com/ Boards, Pins, pin.it Links, related Pins Pixiv https://www.pixiv.net/ |Capabilities-6| Required Pornreactor http://pornreactor.cc/ |Capabilities-7| PowerManga https://powermanga.org/ Chapters, Manga -Read Comic Online http://readcomiconline.to/ Comic-Issues, Comics +Read Comic Online https://readcomiconline.to/ Comic-Issues, Comics RebeccaBlackTech https://rbt.asia/ Threads -Reddit https://reddit.com/ individual Images, Submissions, Subreddits Optional (OAuth) +Reddit https://www.reddit.com/ individual Images, Submissions, Subreddits Optional (OAuth) rule #34 https://rule34.paheal.net/ Posts, Tag-Searches Rule 34 https://rule34.xxx/ Pools, Posts, Tag-Searches Safebooru https://safebooru.org/ Pools, Posts, Tag-Searches @@ -98,7 +98,7 @@ Imagevenue http://imagevenue.com/ individual Images Imgspice https://imgspice.com/ individual Images Imxto https://imx.to/ individual Images Pixhost https://pixhost.to/ individual Images -Postimg https://postimg.org/ individual Images +Postimg https://postimages.org/ individual Images Turboimagehost https://www.turboimagehost.com/ individual Images ==================== =================================== ================================================== ================ diff --git a/gallery_dl/extractor/dokireader.py b/gallery_dl/extractor/dokireader.py index a559b08f..9fb3018a 100644 --- a/gallery_dl/extractor/dokireader.py +++ b/gallery_dl/extractor/dokireader.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -# Copyright 2016-2017 Mike Fährmann +# Copyright 2016-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. -"""Extractors for https://kobato.hologfx.com/""" +"""Extractors for https://kobato.hologfx.com/reader/""" from . import foolslide diff --git a/gallery_dl/extractor/imagehosts.py b/gallery_dl/extractor/imagehosts.py index 9a66c892..5798fbb9 100644 --- a/gallery_dl/extractor/imagehosts.py +++ b/gallery_dl/extractor/imagehosts.py @@ -199,9 +199,9 @@ class PixhostImageExtractor(ImagehostImageExtractor): class PostimgImageExtractor(ImagehostImageExtractor): - """Extractor for single images from postimg.org""" + """Extractor for single images from postimages.org""" category = "postimg" - pattern = [(r"(?:https?://)?((?:www\.)?(?:postimg|pixxxels)\.org/" + pattern = [(r"(?:https?://)?((?:www\.)?(?:postimages|pixxxels)\.org/" r"image/([^/]+)/?)")] https = True params = None diff --git a/gallery_dl/extractor/kissmanga.py b/gallery_dl/extractor/kissmanga.py index f3fad4d0..1bc89ef5 100644 --- a/gallery_dl/extractor/kissmanga.py +++ b/gallery_dl/extractor/kissmanga.py @@ -1,19 +1,19 @@ # -*- coding: utf-8 -*- -# Copyright 2015-2018 Mike Fährmann +# Copyright 2015-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 manga-chapters and entire manga from http://kissmanga.com/""" +"""Extract manga-chapters and entire manga from https://kissmanga.com/""" from .common import ChapterExtractor, MangaExtractor from .. import text, cloudflare, aes, exception from ..cache import cache -import re import hashlib import ast +import re IV = [ 0xa5, 0xe8, 0xe2, 0xe9, 0xc2, 0x72, 0x1b, 0xe0, diff --git a/gallery_dl/extractor/mangafox.py b/gallery_dl/extractor/mangafox.py index 2e1635dc..7619cd19 100644 --- a/gallery_dl/extractor/mangafox.py +++ b/gallery_dl/extractor/mangafox.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -# Copyright 2017-2018 Mike Fährmann +# Copyright 2017-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 manga-chapters and entire manga from http://fanfox.net/""" +"""Extract manga-chapters and entire manga from https://fanfox.net/""" from .common import ChapterExtractor from .. import text @@ -24,7 +24,7 @@ class MangafoxChapterExtractor(ChapterExtractor): }), ("http://mangafox.me/manga/kidou_keisatsu_patlabor/v05/c006.2/", None), ] - root = "http://m.fanfox.net" + root = "https://m.fanfox.net" def __init__(self, match): base, self.cstr, self.volume, self.chapter, self.minor = match.groups() diff --git a/gallery_dl/extractor/mangahere.py b/gallery_dl/extractor/mangahere.py index 0f0cea4c..1565c7ea 100644 --- a/gallery_dl/extractor/mangahere.py +++ b/gallery_dl/extractor/mangahere.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -# Copyright 2015-2018 Mike Fährmann +# Copyright 2015-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 manga-chapters and entire manga from http://www.mangahere.co/""" +"""Extract manga-chapters and entire manga from https://www.mangahere.cc/""" from .common import ChapterExtractor, MangaExtractor from .. import text @@ -17,7 +17,7 @@ import re class MangahereBase(): """Base class for mangahere extractors""" category = "mangahere" - root = "http://www.mangahere.cc" + root = "https://www.mangahere.cc" url_fmt = root + "/manga/{}/{}.html" diff --git a/gallery_dl/extractor/mangastream.py b/gallery_dl/extractor/mangastream.py index 12ae717a..22b81797 100644 --- a/gallery_dl/extractor/mangastream.py +++ b/gallery_dl/extractor/mangastream.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -# Copyright 2015-2018 Mike Fährmann +# Copyright 2015-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 manga-chapters from https://mangastream.com/""" +"""Extract manga-chapters from https://readms.net/""" from .common import ChapterExtractor from .. import text @@ -16,14 +16,18 @@ class MangastreamChapterExtractor(ChapterExtractor): """Extractor for manga-chapters from mangastream.com""" category = "mangastream" archive_fmt = "{chapter_id}_{page}" - pattern = [(r"(?:https?://)?(?:www\.)?(?:readms|mangastream)\.(?:com|net)/" + pattern = [(r"(?:https?://)?(?:www\.)?(?:readms\.net|mangastream\.com)/" r"r(?:ead)?/([^/]*/([^/]+)/(\d+))")] - test = [("https://readms.net/r/onepunch_man/087/4874/1", None)] - base_url = "https://readms.net/r/" + test = [ + ("https://readms.net/r/onepunch_man/087/4874/1", None), + ("https://mangastream.com/r/onepunch_man/087/4874/1", None), + ] + root = "https://readms.net" def __init__(self, match): - self.part, self.chapter, self.ch_id = match.groups() - ChapterExtractor.__init__(self, self.base_url + self.part) + self.part, self.chapter, self.chapter_id = match.groups() + url = "{}/r/{}".format(self.root, self.part) + ChapterExtractor.__init__(self, url) def get_metadata(self, page): manga, pos = text.extract( @@ -34,7 +38,7 @@ class MangastreamChapterExtractor(ChapterExtractor): return { "manga": manga, "chapter": text.unquote(self.chapter), - "chapter_id": text.parse_int(self.ch_id), + "chapter_id": text.parse_int(self.chapter_id), "title": title, "count": text.parse_int(count, 1), "lang": "en", @@ -46,5 +50,5 @@ class MangastreamChapterExtractor(ChapterExtractor): pos = page.index(' class="page"') next_url = text.extract(page, ' href="', '"', pos)[0] image_url = text.extract(page, ' src="', '"', pos)[0] - yield text.urljoin(self.base_url, image_url), None - page = self.request(text.urljoin(self.base_url, next_url)).text + yield text.urljoin(self.root, image_url), None + page = self.request(text.urljoin(self.root, next_url)).text diff --git a/gallery_dl/extractor/pinterest.py b/gallery_dl/extractor/pinterest.py index 83bb8be6..cedd0400 100644 --- a/gallery_dl/extractor/pinterest.py +++ b/gallery_dl/extractor/pinterest.py @@ -6,7 +6,7 @@ # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. -"""Extract images from https://www.pinterest.com""" +"""Extract images from https://www.pinterest.com/""" from .common import Extractor, Message from .. import text, exception diff --git a/gallery_dl/extractor/readcomiconline.py b/gallery_dl/extractor/readcomiconline.py index ebd0d8e2..6c284784 100644 --- a/gallery_dl/extractor/readcomiconline.py +++ b/gallery_dl/extractor/readcomiconline.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -# Copyright 2016-2018 Mike Fährmann +# Copyright 2016-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 comic-issues and entire comics from http://readcomiconline.to/""" +"""Extract comic-issues and entire comics from https://readcomiconline.to/""" from .common import ChapterExtractor, MangaExtractor from .. import text, cloudflare diff --git a/gallery_dl/extractor/reddit.py b/gallery_dl/extractor/reddit.py index 8e922b37..fd823554 100644 --- a/gallery_dl/extractor/reddit.py +++ b/gallery_dl/extractor/reddit.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -# Copyright 2017-2018 Mike Fährmann +# Copyright 2017-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 subreddits at https://reddit.com/""" +"""Extract images from subreddits at https://www.reddit.com/""" from .common import Extractor, Message from .. import text, util, extractor, exception diff --git a/gallery_dl/extractor/seiga.py b/gallery_dl/extractor/seiga.py index 65ac03a5..95421c11 100644 --- a/gallery_dl/extractor/seiga.py +++ b/gallery_dl/extractor/seiga.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -# Copyright 2016-2018 Mike Fährmann +# Copyright 2016-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://seiga.nicovideo.jp""" +"""Extract images from http://seiga.nicovideo.jp/""" from .common import Extractor, Message from .. import text, util, exception