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

[bunkr] fix albums with more than 100 files (#8150)

Browse Source
This commit is contained in:
Mike Fährmann
2025-08-31 15:48:27 +02:00
parent 70524630e4
commit 12a6e0493e
2 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
gallery_dl/extractor/bunkr.py
View File

@@ -62,7 +62,7 @@ class BunkrAlbumExtractor(LolisafeAlbumExtractor):
root = "https://bunkr.si"
root_dl = "https://get.bunkrr.su"
root_api = "https://apidl.bunkr.ru"
archive_fmt = "{album_id}_{id|id_url}"
archive_fmt = "{album_id}_{id|id_url|slug}"
pattern = BASE_PATTERN + r"/a/([^/?#]+)"
example = "https://bunkr.si/a/ID"
@@ -134,13 +134,13 @@ class BunkrAlbumExtractor(LolisafeAlbumExtractor):
def fetch_album(self, album_id):
# album metadata
page = self.request(self.root + "/a/" + album_id).text
page = self.request(f"{self.root}/a/{album_id}?advanced=1").text
title = text.unescape(text.unescape(text.extr(
page, 'property="og:title" content="', '"')))
# files
items = list(text.extract_iter(
page, '<div class="grid-images_box', "</a>"))
items = text.extr(
page, "window.albumFiles = [", "</script>").split("\n},\n")
return self._extract_files(items), {
"album_id" : album_id,
@@ -156,17 +156,19 @@ class BunkrAlbumExtractor(LolisafeAlbumExtractor):
for item in items:
try:
url = text.unescape(text.extr(item, ' href="', '"'))
if url[0] == "/":
url = self.root + url
data_id = text.extr(item, " id: ", ",").strip()
file = self._extract_file(data_id)
file = self._extract_file(url)
info = text.split_html(item)
if not file["name"]:
file["name"] = info[-3]
file["size"] = info[-2]
file["date"] = text.parse_datetime(
info[-1], "%H:%M:%S %d/%m/%Y")
file["name"] = util.json_loads(text.extr(
item, 'original:', ',\n'))
file["slug"] = util.json_loads(text.extr(
item, 'slug: ', ',\n'))
file["uuid"] = text.extr(
item, 'name: "', ".")
file["size"] = text.parse_int(text.extr(
item, "size: ", " ,\n"))
file["date"] = text.parse_datetime(text.extr(
item, 'timestamp: "', '"'), "%H:%M:%S %d/%m/%Y")
yield file
except exception.ControlException:
@@ -175,11 +177,8 @@ class BunkrAlbumExtractor(LolisafeAlbumExtractor):
self.log.error("%s: %s", exc.__class__.__name__, exc)
self.log.debug("", exc_info=exc)
def _extract_file(self, webpage_url):
page = self.request(webpage_url).text
data_id = text.extr(page, 'data-file-id="', '"')
referer = self.root_dl + "/file/" + data_id
def _extract_file(self, data_id):
referer = f"{self.root_dl}/file/{data_id}"
headers = {"Referer": referer, "Origin": self.root_dl}
data = self.request_json(self.endpoint, method="POST", headers=headers,
json={"id": data_id})
@@ -190,14 +189,9 @@ class BunkrAlbumExtractor(LolisafeAlbumExtractor):
else:
file_url = data["url"]
file_name = text.extr(page, "<h1", "<").rpartition(">")[2]
fallback = text.extr(page, 'property="og:url" content="', '"')
return {
"file" : file_url,
"name" : text.unescape(file_name),
"id_url" : data_id,
"_fallback" : (fallback,) if fallback else (),
"_http_headers" : {"Referer": referer},
"_http_validate": self._validate,
}
@@ -222,7 +216,13 @@ class BunkrMediaExtractor(BunkrAlbumExtractor):
def fetch_album(self, album_id):
try:
file = self._extract_file(self.root + album_id)
page = self.request(f"{self.root}{album_id}").text
data_id = text.extr(page, 'data-file-id="', '"')
file = self._extract_file(data_id)
file["name"] = text.unescape(text.extr(
page, "<h1", "<").rpartition(">")[2])
file["slug"] = album_id.rpartition("/")[2]
file["uuid"] = text.extr(page, "/thumbs/", ".")
except Exception as exc:
self.log.error("%s: %s", exc.__class__.__name__, exc)
return (), {}