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

[fanbox] return 'fileMap' files in order (#2718)

Browse Source
This commit is contained in:
Mike Fährmann
2025-05-26 22:05:51 +02:00
parent 204c94ccb4
commit 45cd81639e
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
gallery_dl/extractor/fanbox.py
View File

@@ -95,26 +95,21 @@ class FanboxExtractor(Extractor):
if "blocks" in content_body:
content = [] # text content
images = [] # image IDs in 'body' order
files = [] # file IDs in 'body' order
append = content.append
append_img = images.append
for block in content_body["blocks"]:
if "text" in block:
append(block["text"])
content.append(block["text"])
if "links" in block:
for link in block["links"]:
append(link["url"])
content.append(link["url"])
if "imageId" in block:
append_img(block["imageId"])
images.append(block["imageId"])
if "fileId" in block:
files.append(block["fileId"])
if images and "imageMap" in content_body:
# reorder 'imageMap' (#2718)
image_map = content_body["imageMap"]
content_body["imageMap"] = {
image_id: image_map[image_id]
for image_id in images
if image_id in image_map
}
self._sort_map(content_body, "imageMap", images)
self._sort_map(content_body, "fileMap", files)
post["content"] = "\n".join(content)
@@ -145,6 +140,19 @@ class FanboxExtractor(Extractor):
return content_body, post
def _sort_map(self, body, key, ids):
orig = body.get(key)
if not orig:
return {} if orig is None else orig
body[key] = new = {
id: orig[id]
for id in ids
if id in orig
}
return new
@memcache(keyarg=1)
def _get_user_data(self, creator_id):
url = "https://api.fanbox.cc/creator.get"