From 4bcbc2d5b4bee94572b4e5105b918cb68ee9b819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sat, 29 Mar 2025 20:06:11 +0100 Subject: [PATCH] [E621:pool] fix AttributeError (#7265) fixes regression introduced in 24bbcbcfa3fa5e7a18b431611dbce9f3f70385aa --- gallery_dl/extractor/danbooru.py | 5 +++-- gallery_dl/version.py | 2 +- test/results/e621.py | 4 ++-- test/results/e926.py | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gallery_dl/extractor/danbooru.py b/gallery_dl/extractor/danbooru.py index 741800cf..06c31b9b 100644 --- a/gallery_dl/extractor/danbooru.py +++ b/gallery_dl/extractor/danbooru.py @@ -282,10 +282,11 @@ class DanbooruPoolExtractor(DanbooruExtractor): example = "https://danbooru.donmai.us/pools/12345" def metadata(self): - return self._collection_metadata(self.groups[-1], "pool") + self.pool_id = self.groups[-1] + return self._collection_metadata(self.pool_id, "pool") def posts(self): - return self._collection_posts(self.groups[-1], "pool") + return self._collection_posts(self.pool_id, "pool") class DanbooruFavgroupExtractor(DanbooruExtractor): diff --git a/gallery_dl/version.py b/gallery_dl/version.py index 43b234de..78e3cc39 100644 --- a/gallery_dl/version.py +++ b/gallery_dl/version.py @@ -6,5 +6,5 @@ # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. -__version__ = "1.29.3" +__version__ = "1.29.4-dev" __variant__ = None diff --git a/test/results/e621.py b/test/results/e621.py index 3e51f169..45f0965f 100644 --- a/test/results/e621.py +++ b/test/results/e621.py @@ -140,11 +140,11 @@ __tests__ = ( }, { - "#url" : "https://e621.net/favorites?page=2&user_id=53275", + "#url" : "https://e621.net/favorites?page=1&user_id=460755", "#category": ("E621", "e621", "favorite"), "#class" : e621.E621FavoriteExtractor, "#pattern" : r"https://static\d.e621.net/data/../../[0-9a-f]+", - "#count" : "> 260", + "#count" : 15, }, { diff --git a/test/results/e926.py b/test/results/e926.py index b046b459..e290a3d6 100644 --- a/test/results/e926.py +++ b/test/results/e926.py @@ -77,11 +77,11 @@ __tests__ = ( }, { - "#url" : "https://e926.net/favorites?page=2&user_id=53275", + "#url" : "https://e926.net/favorites?page=1&user_id=460755", "#category": ("E621", "e926", "favorite"), "#class" : e621.E621FavoriteExtractor, "#pattern" : r"https://static\d.e926.net/data/../../[0-9a-f]+", - "#count" : "> 260", + "#count" : 15, }, )