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

[deviantart] add 'is_original' metadata field (#4559)

Browse Source 
true for 'downloadable' content, journals, flash animations,
and images without '/v1/' in their URL; false otherwise
This commit is contained in:
Mike Fährmann
2023-09-22 17:37:11 +02:00
parent 9d8317d963
commit 2ad75bab05
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gallery_dl/extractor/deviantart.py
View File

@@ -130,14 +130,17 @@ class DeviantartExtractor(Extractor):
elif deviation["is_downloadable"]: elif deviation["is_downloadable"]:
content = self.api.deviation_download(deviation["deviationid"]) content = self.api.deviation_download(deviation["deviationid"])
deviation["is_original"] = True
yield self.commit(deviation, content) yield self.commit(deviation, content)
if "videos" in deviation and deviation["videos"]: if "videos" in deviation and deviation["videos"]:
video = max(deviation["videos"], video = max(deviation["videos"],
key=lambda x: text.parse_int(x["quality"][:-1])) key=lambda x: text.parse_int(x["quality"][:-1]))
deviation["is_original"] = False
yield self.commit(deviation, video) yield self.commit(deviation, video)
if "flash" in deviation: if "flash" in deviation:
deviation["is_original"] = True
yield self.commit(deviation, deviation["flash"]) yield self.commit(deviation, deviation["flash"])
if self.commit_journal: if self.commit_journal:
@@ -151,6 +154,7 @@ class DeviantartExtractor(Extractor):
if journal: if journal:
if self.extra: if self.extra:
deviation["_journal"] = journal["html"] deviation["_journal"] = journal["html"]
deviation["is_original"] = True
yield self.commit_journal(deviation, journal) yield self.commit_journal(deviation, journal)
if not self.extra: if not self.extra:
@@ -228,6 +232,8 @@ class DeviantartExtractor(Extractor):
target["filename"] = deviation["filename"] target["filename"] = deviation["filename"]
deviation["target"] = target deviation["target"] = target
deviation["extension"] = target["extension"] = text.ext_from_url(name) deviation["extension"] = target["extension"] = text.ext_from_url(name)
if "is_original" not in deviation:
deviation["is_original"] = ("/v1/" not in url)
return Message.Url, url, deviation return Message.Url, url, deviation
def _commit_journal_html(self, deviation, journal): def _commit_journal_html(self, deviation, journal):
@@ -329,6 +335,7 @@ class DeviantartExtractor(Extractor):
public = False if "premium_folder_data" in deviation else None public = False if "premium_folder_data" in deviation else None
data = self.api.deviation_download(deviation["deviationid"], public) data = self.api.deviation_download(deviation["deviationid"], public)
content.update(data) content.update(data)
deviation["is_original"] = True
def _update_content_image(self, deviation, content): def _update_content_image(self, deviation, content):
data = self.api.deviation_download(deviation["deviationid"]) data = self.api.deviation_download(deviation["deviationid"])
@@ -336,6 +343,7 @@ class DeviantartExtractor(Extractor):
mtype = mimetypes.guess_type(url, False)[0] mtype = mimetypes.guess_type(url, False)[0]
if mtype and mtype.startswith("image/"): if mtype and mtype.startswith("image/"):
content.update(data) content.update(data)
deviation["is_original"] = True
def _update_token(self, deviation, content): def _update_token(self, deviation, content):
"""Replace JWT to be able to remove width/height limits """Replace JWT to be able to remove width/height limits