From fd0e1ffd6ef2b8cb24a78681106cd7e7a38d8ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sun, 14 May 2023 16:35:31 +0200 Subject: [PATCH] [danbooru] improve 75666cf9 (#4002) Search for direct post IDs instead of trying to replicate the same results as the initial request. --- gallery_dl/extractor/danbooru.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gallery_dl/extractor/danbooru.py b/gallery_dl/extractor/danbooru.py index ab23520a..ded25d33 100644 --- a/gallery_dl/extractor/danbooru.py +++ b/gallery_dl/extractor/danbooru.py @@ -105,16 +105,17 @@ class DanbooruExtractor(BaseExtractor): posts = posts["posts"] if self.includes and posts: - if not pages and "only" not in params: - params["page"] = "b{}".format(posts[0]["id"] + 1) - params["only"] = self.includes + params_meta = { + "only" : self.includes, + "limit": len(posts), + "tags" : "id:" + ",".join(str(p["id"]) for p in posts), + } data = { meta["id"]: meta - for meta in self.request(url, params=params).json() + for meta in self.request(url, params=params_meta).json() } for post in posts: post.update(data[post["id"]]) - params["only"] = None yield from posts @@ -155,7 +156,7 @@ BASE_PATTERN = DanbooruExtractor.update({ "aibooru": { "root": None, "pattern": r"(?:safe.)?aibooru\.online", - } + }, })