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

[deviantart] move image content extraction into separate function

Browse Source
This commit is contained in:
Mike Fährmann
2024-02-14 00:25:03 +01:00
parent 61a50da086
commit 966c8608e6
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
gallery_dl/extractor/deviantart.py
View File

@@ -63,6 +63,7 @@ class DeviantartExtractor(Extractor):
if self.quality:
self.quality = ",q_{}".format(self.quality)
self.quality_sub = re.compile(r",q_\d+").sub
if self.original != "image":
self._update_content = self._update_content_default
@@ -135,26 +136,7 @@ class DeviantartExtractor(Extractor):
yield Message.Directory, deviation
if "content" in deviation:
content = deviation["content"]
if self.original and deviation["is_downloadable"]:
self._update_content(deviation, content)
elif self.jwt:
self._update_token(deviation, content)
elif content["src"].startswith("https://images-wixmp-"):
if self.intermediary and deviation["index"] <= 790677560:
# https://github.com/r888888888/danbooru/issues/4069
intermediary, count = re.subn(
r"(/f/[^/]+/[^/]+)/v\d+/.*",
r"/intermediary\1", content["src"], 1)
if count:
deviation["is_original"] = False
deviation["_fallback"] = (content["src"],)
content["src"] = intermediary
if self.quality:
content["src"] = re.sub(
r",q_\d+", self.quality, content["src"], 1)
content = self._extract_content(deviation)
yield self.commit(deviation, content)
elif deviation["is_downloadable"]:
@@ -339,6 +321,33 @@ class DeviantartExtractor(Extractor):
deviation["extension"] = "txt"
return Message.Url, txt, deviation
def _extract_content(self, deviation):
content = deviation["content"]
if self.original and deviation["is_downloadable"]:
self._update_content(deviation, content)
return content
if self.jwt:
self._update_token(deviation, content)
return content
if content["src"].startswith("https://images-wixmp-"):
if self.intermediary and deviation["index"] <= 790677560:
# https://github.com/r888888888/danbooru/issues/4069
intermediary, count = re.subn(
r"(/f/[^/]+/[^/]+)/v\d+/.*",
r"/intermediary\1", content["src"], 1)
if count:
deviation["is_original"] = False
deviation["_fallback"] = (content["src"],)
content["src"] = intermediary
if self.quality:
content["src"] = self.quality_sub(
self.quality, content["src"], 1)
return content
@staticmethod
def _find_folder(folders, name, uuid):
if uuid.isdecimal():