From 89276c5b3e33cd8d4bc10e7fb2f012dc3807b08e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Tue, 7 Jan 2025 20:00:26 +0100 Subject: [PATCH] [e621] match 'tag' search URLs with empty tag (#6783) --- gallery_dl/extractor/e621.py | 2 +- test/results/e621.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gallery_dl/extractor/e621.py b/gallery_dl/extractor/e621.py index 4a6624d0..33e6ba8e 100644 --- a/gallery_dl/extractor/e621.py +++ b/gallery_dl/extractor/e621.py @@ -90,7 +90,7 @@ BASE_PATTERN = E621Extractor.update({ class E621TagExtractor(E621Extractor, danbooru.DanbooruTagExtractor): """Extractor for e621 posts from tag searches""" - pattern = BASE_PATTERN + r"/posts?(?:\?.*?tags=|/index/\d+/)([^&#]+)" + pattern = BASE_PATTERN + r"/posts?(?:\?[^#]*?tags=|/index/\d+/)([^&#]*)" example = "https://e621.net/posts?tags=TAG" diff --git a/test/results/e621.py b/test/results/e621.py index b49a9973..b4b431b4 100644 --- a/test/results/e621.py +++ b/test/results/e621.py @@ -29,6 +29,12 @@ __tests__ = ( "#class" : e621.E621TagExtractor, }, +{ + "#url" : "https://e621.net/post?tags=", + "#category": ("E621", "e621", "tag"), + "#class" : e621.E621TagExtractor, +}, + { "#url" : "https://e621.net/pools/73", "#category": ("E621", "e621", "pool"),