From aa397707830f0aa5ef4ed4ccbc7bf5d1aef75ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Tue, 18 Nov 2025 21:46:57 +0100 Subject: [PATCH] [aryion:search] simplify further - skip 'build_query()' step - add underscores to prefixes --- gallery_dl/extractor/aryion.py | 13 ++++++------- test/results/aryion.py | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gallery_dl/extractor/aryion.py b/gallery_dl/extractor/aryion.py index 21a2590a..cc850204 100644 --- a/gallery_dl/extractor/aryion.py +++ b/gallery_dl/extractor/aryion.py @@ -237,25 +237,24 @@ class AryionTagExtractor(AryionExtractor): class AryionSearchExtractor(AryionExtractor): """Extractor for searches on eka's portal""" subcategory = "search" - directory_fmt = ("{category}", "searches", "{search[prefix]:?/_/}" + directory_fmt = ("{category}", "searches", "{search[prefix]}" "{search[q]|search[tags]|search[user]}") - archive_fmt = ("s_{search[prefix]:?/_/}" + archive_fmt = ("s_{search[prefix]}" "{search[q]|search[tags]|search[user]}_{id}") pattern = rf"{BASE_PATTERN}/search\.php\?([^#]+)" example = "https://aryion.com/g4/search.php?q=TEXT&tags=TAGS&user=USER" def metadata(self): - self.params = params = text.parse_query(self.user) - + params = text.parse_query(self.user) return {"search": { **params, "prefix": ("" if params.get("q") else - "t" if params.get("tags") else - "u" if params.get("user") else ""), + "t_" if params.get("tags") else + "u_" if params.get("user") else ""), }} def posts(self): - url = f"{self.root}/g4/search.php?{text.build_query(self.params)}" + url = f"{self.root}/g4/search.php?{self.user}" return self._pagination_next(url) diff --git a/test/results/aryion.py b/test/results/aryion.py index 51778723..0db20c66 100644 --- a/test/results/aryion.py +++ b/test/results/aryion.py @@ -124,7 +124,7 @@ __tests__ = ( "search" : { "from_date" : "04/01/2025", "p" : "2", - "prefix" : "t", + "prefix" : "t_", "q" : "", "sort" : "view_count", "tags" : "water, ",