github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[furaffinity] expand URL pattern for searches (closes #1780)

Browse Source
This commit is contained in:
Mike Fährmann
2021-08-23 23:38:52 +02:00
parent 0817f468ef
commit 6b229ac829
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gallery_dl/extractor/furaffinity.py
View File

@@ -232,16 +232,27 @@ class FuraffinitySearchExtractor(FuraffinityExtractor):
"""Extractor for furaffinity search results""" """Extractor for furaffinity search results"""
subcategory = "search" subcategory = "search"
directory_fmt = ("{category}", "Search", "{search}") directory_fmt = ("{category}", "Search", "{search}")
pattern = BASE_PATTERN + r"/search/?\?([^#]+)" pattern = BASE_PATTERN + r"/search(?:/([^/?#]+))?/?[?&]([^#]+)"
test = ("https://www.furaffinity.net/search/?q=cute", { test = (
"pattern": r"https://d\d?\.f(uraffinity|acdn)\.net" ("https://www.furaffinity.net/search/?q=cute", {
r"/art/[^/]+/\d+/\d+.\w+\.\w+", "pattern": r"https://d\d?\.f(uraffinity|acdn)\.net"
"range": "45-50", r"/art/[^/]+/\d+/\d+.\w+\.\w+",
"count": 6, "range": "45-50",
}) "count": 6,
}),
("https://www.furaffinity.net/search/cute&rating-general=0", {
"range": "1",
"count": 1,
}),
)
def __init__(self, match):
FuraffinityExtractor.__init__(self, match)
self.query = text.parse_query(match.group(2))
if self.user and "q" not in self.query:
self.query["q"] = text.unescape(self.user)
def metadata(self): def metadata(self):
self.query = text.parse_query(self.user)
return {"search": self.query.get("q")} return {"search": self.query.get("q")}
def posts(self): def posts(self):