From 1f2a69f3c573d2db33b133f9623484600f432924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sun, 29 Dec 2019 23:37:34 +0100 Subject: [PATCH] add '_extractor' information to redirect results --- gallery_dl/extractor/imgur.py | 2 +- gallery_dl/extractor/pinterest.py | 2 +- gallery_dl/extractor/pixiv.py | 3 ++- gallery_dl/extractor/wikiart.py | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gallery_dl/extractor/imgur.py b/gallery_dl/extractor/imgur.py index ce3e1ce6..6ff6588b 100644 --- a/gallery_dl/extractor/imgur.py +++ b/gallery_dl/extractor/imgur.py @@ -153,7 +153,7 @@ class ImgurAlbumExtractor(ImgurExtractor): "is_album" : True, "layout" : "blog", "link" : "https://imgur.com/a/TcBmP", - "nsfw" : False, + "nsfw" : True, "privacy" : "hidden", "section" : None, "title" : "138", diff --git a/gallery_dl/extractor/pinterest.py b/gallery_dl/extractor/pinterest.py index bcdd082c..b72a8968 100644 --- a/gallery_dl/extractor/pinterest.py +++ b/gallery_dl/extractor/pinterest.py @@ -175,7 +175,7 @@ class PinterestPinitExtractor(PinterestExtractor): "https://pin.it/None", "https://www.pinterest.com"): raise exception.NotFoundError("pin") - yield Message.Queue, location, {} + yield Message.Queue, location, {"_extractor": PinterestPinExtractor} class PinterestAPI(): diff --git a/gallery_dl/extractor/pixiv.py b/gallery_dl/extractor/pixiv.py index ce3d9476..0a642a0b 100644 --- a/gallery_dl/extractor/pixiv.py +++ b/gallery_dl/extractor/pixiv.py @@ -142,10 +142,11 @@ class PixivMeExtractor(PixivExtractor): def items(self): url = "https://pixiv.me/" + self.account + data = {"_extractor": PixivUserExtractor} response = self.request( url, method="HEAD", allow_redirects=False, notfound="user") yield Message.Version, 1 - yield Message.Queue, response.headers["Location"], {} + yield Message.Queue, response.headers["Location"], data class PixivWorkExtractor(PixivExtractor): diff --git a/gallery_dl/extractor/wikiart.py b/gallery_dl/extractor/wikiart.py index ac289df5..b614cab7 100644 --- a/gallery_dl/extractor/wikiart.py +++ b/gallery_dl/extractor/wikiart.py @@ -69,8 +69,8 @@ class WikiartArtistExtractor(WikiartExtractor): directory_fmt = ("{category}", "{artist[artistName]}") pattern = BASE_PATTERN + r"/(?!\w+-by-)([\w-]+)" test = ("https://www.wikiart.org/en/thomas-cole", { - "url": "f1eee8158f5b8b7380382ab730a8f53884715c8b", - "keyword": "c61f5a4774b977106000e9554d19cfb9438a7032", + "url": "9049e52e897b9ae6586df4c2c4f827d0a19dafa3", + "keyword": "c3168b21a993707c41efb7674e8c90d53a79d483", }) def __init__(self, match):