From 2ecf1efb1692ac4945ca9ab0f3aec34ddf156fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sat, 18 Jul 2020 14:50:46 +0200 Subject: [PATCH] update extractor test results - tumblr: remove deleted post - jaiminisbox: replace removed manga/chapters - smugmug: one inconsequential field got removed --- gallery_dl/extractor/foolslide.py | 15 +++++---------- gallery_dl/extractor/imagefap.py | 2 +- gallery_dl/extractor/smugmug.py | 4 ++-- gallery_dl/extractor/tumblr.py | 3 --- test/test_results.py | 8 ++++---- 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/gallery_dl/extractor/foolslide.py b/gallery_dl/extractor/foolslide.py index 731f54b7..715e294f 100644 --- a/gallery_dl/extractor/foolslide.py +++ b/gallery_dl/extractor/foolslide.py @@ -155,18 +155,13 @@ EXTRACTORS = { "root": "https://jaiminisbox.com/reader", "pattern": r"(?:www\.)?jaiminisbox\.com/reader", "extra": {"decode": "base64"}, - "test-chapter": ( - ("https://jaiminisbox.com/reader/read/fire-force/en/0/215/", { - "keyword": "6d2b5c0b34344156b0301ff2733389dfe36a7604", + "test-chapter": + ("https://jaiminisbox.com/reader/read/oshi-no-ko/en/0/1/", { + "keyword": "d6435cfc1522293a42517a4aadda95a8631da0b3", }), - ("https://jaiminisbox.com/reader/read/red-storm/en/0/336/", { - "keyword": "53c6dddf3e5a61b6002a886ccd7e3354e973299a", - }), - ), "test-manga": - ("https://jaiminisbox.com/reader/series/sora_no_kian/", { - "url": "66612be177dc3b3fa1d1f537ef02f4f701b163ea", - "keyword": "0908a4145bb03acc4210f5d01169988969f5acd1", + ("https://jaiminisbox.com/reader/series/oshi-no-ko/", { + "count": ">= 10", }), }, "kireicake": { diff --git a/gallery_dl/extractor/imagefap.py b/gallery_dl/extractor/imagefap.py index fd976054..bf0ac63a 100644 --- a/gallery_dl/extractor/imagefap.py +++ b/gallery_dl/extractor/imagefap.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://imagefap.com/""" +"""Extractors for https://www.imagefap.com/""" from .common import Extractor, Message from .. import text diff --git a/gallery_dl/extractor/smugmug.py b/gallery_dl/extractor/smugmug.py index 69b8cb90..44a0a846 100644 --- a/gallery_dl/extractor/smugmug.py +++ b/gallery_dl/extractor/smugmug.py @@ -112,13 +112,13 @@ class SmugmugImageExtractor(SmugmugExtractor): test = ( ("https://tdm.smugmug.com/Nature/Dove/i-kCsLJT6", { "url": "f624ad7293afd6412a7d34e3950a118596c36c85", - "keyword": "ea70e93be5067dca988d871dcf9afac491a189a4", + "keyword": "085861b5935e3cd96ad15954039bc2419cdf1c27", "content": "ecbd9d7b4f75a637abc8d35319be9ec065a44eb0", }), # video ("https://tstravels.smugmug.com/Dailies/Daily-Dose-2015/i-39JFNzB", { "url": "04d0ab1ff829ca7d78f5acb5548953df08e9a5ee", - "keyword": "c708c4b9527a2fb29396c19f7628f9cf4b0b3a39", + "keyword": "e0927fda7b1c39c19974625270102ad7e72b9d6f", }), ) diff --git a/gallery_dl/extractor/tumblr.py b/gallery_dl/extractor/tumblr.py index 70fead81..4d518513 100644 --- a/gallery_dl/extractor/tumblr.py +++ b/gallery_dl/extractor/tumblr.py @@ -276,9 +276,6 @@ class TumblrPostExtractor(TumblrExtractor): ("https://mikf123.tumblr.com/post/181022380064/chat-post", { "count": 0, }), - ("http://pinetre-3.tumblr.com/post/181904381470/via", { - "count": 0, # audio post with "null" as URL (#165) - }), ("http://ziemniax.tumblr.com/post/109697912859/", { "exception": exception.NotFoundError, # HTML response (#297) }), diff --git a/test/test_results.py b/test/test_results.py index 6a943aa2..dd1ed1d5 100644 --- a/test/test_results.py +++ b/test/test_results.py @@ -309,10 +309,6 @@ def setup_test_config(): config.set(("extractor", "nijie") , "username", email) config.set(("extractor", "seiga") , "username", email) - config.set(("extractor", "danbooru") , "username", None) - config.set(("extractor", "e621") , "username", None) - config.set(("extractor", "instagram") , "username", None) - config.set(("extractor", "twitter") , "username", None) config.set(("extractor", "newgrounds"), "username", "d1618111") config.set(("extractor", "newgrounds"), "password", "d1618111") @@ -320,6 +316,10 @@ def setup_test_config(): config.set(("extractor", "mangoxo") , "username", "LiQiang3") config.set(("extractor", "mangoxo") , "password", "5zbQF10_5u25259Ma") + for category in ("danbooru", "instagram", "twitter", "subscribestar", + "e621"): + config.set(("extractor", category), "username", None) + config.set(("extractor", "mastodon.social"), "access-token", "Blf9gVqG7GytDTfVMiyYQjwVMQaNACgf3Ds3IxxVDUQ")