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

[deviantart] update

Browse Source 
- use 'index_file' for additional file IDs
- rename 'img_count' to 'count'
- update 'archive_fmt'
This commit is contained in:
Mike Fährmann
2025-03-28 17:15:56 +01:00
parent af23894911
commit 1e498a04f3
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gallery_dl/extractor/deviantart.py
View File

@@ -7,10 +7,10 @@
# published by the Free Software Foundation. # published by the Free Software Foundation.
"""Extractors for https://www.deviantart.com/""" """Extractors for https://www.deviantart.com/"""
from .common import Extractor, Message from .common import Extractor, Message
from .. import text, util, exception from .. import text, util, exception
from ..cache import cache, memcache from ..cache import cache, memcache
import json
import collections import collections
import mimetypes import mimetypes
import binascii import binascii
@@ -1282,24 +1282,27 @@ class DeviantartDeviationExtractor(DeviantartExtractor):
# Clean up escaped quotes # Clean up escaped quotes
_json_str = re.sub( _json_str = re.sub(
r'(?<!\\)\\{1}"', '"', _dev_info).replace("\\'", "'") r'(?<!\\)\\{1}"', '"', _dev_info).replace("\\'", "'")
_extended_info = json.loads(_json_str)[self.deviation_id] _extended_info = util.json_loads(_json_str)[self.deviation_id]
additional_media = _extended_info.get('additionalMedia', []) additional_media = _extended_info.get("additionalMedia") or ()
if len(additional_media) > 0: if additional_media:
self.filename_fmt = \ self.filename_fmt = ("{category}_{index}_{index_file}_{title}_"
"{category}_{index}_{title}_{num:>02}.{extension}" "{num:>02}.{extension}")
self.archive_fmt = ("g_{_username}_{index}{index_file:?_//}."
"{extension}")
deviation["img_count"] = 1 + len(additional_media) deviation["index_file"] = 0
deviation["count"] = 1 + len(additional_media)
deviation["num"] = 1 deviation["num"] = 1
yield deviation yield deviation
for index, post in enumerate(additional_media): for index, post in enumerate(additional_media):
uri = post['media']['baseUri'].encode().decode('unicode-escape') uri = post["media"]["baseUri"].encode().decode("unicode-escape")
deviation["content"]["src"] = uri deviation["content"]["src"] = uri
deviation["num"] += 1 deviation["num"] += 1
deviation['index'] = post['fileId'] deviation["index_file"] = post["fileId"]
# Download only works on purchased materials - no way to check # Download only works on purchased materials - no way to check
deviation['is_downloadable'] = False deviation["is_downloadable"] = False
yield deviation yield deviation