From 2919d78bfc7acf20918b579126df0fcee5f16137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sun, 14 Feb 2021 15:37:39 +0100 Subject: [PATCH] update extractor test results --- gallery_dl/extractor/2chan.py | 4 ++-- gallery_dl/extractor/furaffinity.py | 20 ++++++++++++-------- gallery_dl/extractor/webtoons.py | 1 + 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/gallery_dl/extractor/2chan.py b/gallery_dl/extractor/2chan.py index d34209fa..f5d2a4c8 100644 --- a/gallery_dl/extractor/2chan.py +++ b/gallery_dl/extractor/2chan.py @@ -22,8 +22,8 @@ class _2chanThreadExtractor(Extractor): url_fmt = "https://{server}.2chan.net/{board}/src/{filename}" pattern = r"(?:https?://)?([^.]+)\.2chan\.net/([^/]+)/res/(\d+)" test = ("http://dec.2chan.net/70/res/4752.htm", { - "url": "20c211ae7c06b18ec345a057fe0b68dde979b051", - "keyword": "23a529b46313b927fc94b577e5e1fdb3aa164ac1", + "url": "f49aa31340e9a3429226af24e19e01f5b819ca1f", + "keyword": "44599c21b248e79692b2eb2da12699bd0ed5640a", }) def __init__(self, match): diff --git a/gallery_dl/extractor/furaffinity.py b/gallery_dl/extractor/furaffinity.py index df5a73e2..a7b0356d 100644 --- a/gallery_dl/extractor/furaffinity.py +++ b/gallery_dl/extractor/furaffinity.py @@ -186,7 +186,8 @@ class FuraffinityGalleryExtractor(FuraffinityExtractor): subcategory = "gallery" pattern = BASE_PATTERN + r"/gallery/([^/?#]+)" test = ("https://www.furaffinity.net/gallery/mirlinthloth/", { - "pattern": r"https://d\d?.facdn.net/art/mirlinthloth/\d+/\d+.\w+\.\w+", + "pattern": r"https://d\d?\.f(uraffinity|acdn)\.net" + r"/art/mirlinthloth/\d+/\d+.\w+\.\w+", "range": "45-50", "count": 6, }) @@ -198,7 +199,8 @@ class FuraffinityScrapsExtractor(FuraffinityExtractor): directory_fmt = ("{category}", "{user!l}", "Scraps") pattern = BASE_PATTERN + r"/scraps/([^/?#]+)" test = ("https://www.furaffinity.net/scraps/mirlinthloth/", { - "pattern": r"https://d\d?.facdn.net/art/[^/]+(/stories)?/\d+/\d+.\w+.", + "pattern": r"https://d\d?\.f(uraffinity|acdn)\.net" + r"/art/[^/]+(/stories)?/\d+/\d+.\w+.", "count": ">= 3", }) @@ -209,7 +211,8 @@ class FuraffinityFavoriteExtractor(FuraffinityExtractor): directory_fmt = ("{category}", "{user!l}", "Favorites") pattern = BASE_PATTERN + r"/favorites/([^/?#]+)" test = ("https://www.furaffinity.net/favorites/mirlinthloth/", { - "pattern": r"https://d\d?.facdn.net/art/[^/]+/\d+/\d+.\w+\.\w+", + "pattern": r"https://d\d?\.f(uraffinity|acdn)\.net" + r"/art/[^/]+/\d+/\d+.\w+\.\w+", "range": "45-50", "count": 6, }) @@ -224,7 +227,8 @@ class FuraffinitySearchExtractor(FuraffinityExtractor): directory_fmt = ("{category}", "Search", "{search}") pattern = BASE_PATTERN + r"/search/?\?([^#]+)" test = ("https://www.furaffinity.net/search/?q=cute", { - "pattern": r"https://d\d?.facdn.net/art/[^/]+/\d+/\d+.\w+\.\w+", + "pattern": r"https://d\d?\.f(uraffinity|acdn)\.net" + r"/art/[^/]+/\d+/\d+.\w+\.\w+", "range": "45-50", "count": 6, }) @@ -243,9 +247,9 @@ class FuraffinityPostExtractor(FuraffinityExtractor): pattern = BASE_PATTERN + r"/(?:view|full)/(\d+)" test = ( ("https://www.furaffinity.net/view/21835115/", { - "pattern": r"https://d\d*\.facdn\.net/(download/)?art/mirlinthloth" - r"/music/1488278723/1480267446.mirlinthloth_dj_fennmink" - r"_-_bude_s_4_ever\.mp3", + "pattern": r"https://d\d*\.f(uraffinity|acdn)\.net/(download/)?art" + r"/mirlinthloth/music/1488278723/1480267446.mirlinthlot" + r"h_dj_fennmink_-_bude_s_4_ever\.mp3", "keyword": { "artist" : "mirlinthloth", "artist_url" : "mirlinthloth", @@ -256,7 +260,7 @@ class FuraffinityPostExtractor(FuraffinityExtractor): "id" : 21835115, "tags" : list, "title" : "Bude's 4 Ever", - "url" : r"re:https://d\d?.facdn.net/art/mirlinthloth/m", + "url" : r"re:https://d\d?\.f(uraffinity|acdn)\.net/art", "user" : "mirlinthloth", "views" : int, "favorites" : int, diff --git a/gallery_dl/extractor/webtoons.py b/gallery_dl/extractor/webtoons.py index 4449e190..1a262640 100644 --- a/gallery_dl/extractor/webtoons.py +++ b/gallery_dl/extractor/webtoons.py @@ -48,6 +48,7 @@ class WebtoonsEpisodeExtractor(WebtoonsExtractor): "/ep-572-earth/viewer?title_no=352&episode_no=572"), { "url": "11041d71a3f92728305c11a228e77cf0f7aa02ef", "content": ("1748c7e82b6db910fa179f6dc7c4281b0f680fa7", + "42055e44659f6ffc410b3fb6557346dfbb993df3", "49e1f2def04c6f7a6a3dacf245a1cd9abe77a6a9"), "count": 5, }),