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

[e621] fix 'popular' extraction

Browse Source
This commit is contained in:
Mike Fährmann
2022-08-24 16:03:19 +02:00
parent 7e385ed63e
commit f362d4a3c7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gallery_dl/extractor/danbooru.py
View File

@@ -34,6 +34,7 @@ class DanbooruExtractor(BaseExtractor):
self.per_page = iget("per-page", 200) self.per_page = iget("per-page", 200)
self.request_interval_min = iget("request-interval-min", 0.0) self.request_interval_min = iget("request-interval-min", 0.0)
self._pools = iget("pools") self._pools = iget("pools")
self._popular_endpoint = iget("popular", "/explore/posts/popular.json")
BaseExtractor.__init__(self, match) BaseExtractor.__init__(self, match)
@@ -150,6 +151,7 @@ INSTANCES = {
"headers": {"User-Agent": "gallery-dl/{} (by mikf)".format( "headers": {"User-Agent": "gallery-dl/{} (by mikf)".format(
__version__)}, __version__)},
"pools": "sort", "pools": "sort",
"popular": "/popular.json",
"page-limit": 750, "page-limit": 750,
"per-page": 320, "per-page": 320,
"request-interval-min": 1.0, "request-interval-min": 1.0,
@@ -308,7 +310,7 @@ class DanbooruPopularExtractor(DanbooruExtractor):
subcategory = "popular" subcategory = "popular"
directory_fmt = ("{category}", "popular", "{scale}", "{date}") directory_fmt = ("{category}", "popular", "{scale}", "{date}")
archive_fmt = "P_{scale[0]}_{date}_{id}" archive_fmt = "P_{scale[0]}_{date}_{id}"
pattern = BASE_PATTERN + r"/explore/posts/popular(?:\?([^#]*))?" pattern = BASE_PATTERN + r"/(?:explore/posts/)?popular(?:\?([^#]*))?"
test = ( test = (
("https://danbooru.donmai.us/explore/posts/popular"), ("https://danbooru.donmai.us/explore/posts/popular"),
(("https://danbooru.donmai.us/explore/posts/popular" (("https://danbooru.donmai.us/explore/posts/popular"
@@ -316,7 +318,7 @@ class DanbooruPopularExtractor(DanbooruExtractor):
"range": "1-120", "range": "1-120",
"count": 120, "count": 120,
}), }),
("https://e621.net/explore/posts/popular"), ("https://e621.net/popular"),
(("https://e621.net/explore/posts/popular" (("https://e621.net/explore/posts/popular"
"?date=2019-06-01&scale=month"), { "?date=2019-06-01&scale=month"), {
"pattern": r"https://static\d.e621.net/data/../../[0-9a-f]+", "pattern": r"https://static\d.e621.net/data/../../[0-9a-f]+",
@@ -345,8 +347,7 @@ class DanbooruPopularExtractor(DanbooruExtractor):
def posts(self): def posts(self):
if self.page_start is None: if self.page_start is None:
self.page_start = 1 self.page_start = 1
return self._pagination( return self._pagination(self._popular_endpoint, self.params, True)
"/explore/posts/popular.json", self.params, True)
class DanbooruFavoriteExtractor(DanbooruExtractor): class DanbooruFavoriteExtractor(DanbooruExtractor):