From 9587aea98f65bd2e0f02f9697e6a5d03c73d635a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Thu, 11 Apr 2019 10:37:01 +0200 Subject: [PATCH] [deviantart] don't rewrite URLs for newer deviations The '/intermediary/' trick stopped working for recently posted deviations, but it still appears to be functional for older ones. --- gallery_dl/extractor/deviantart.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index 3941f246..b9914db4 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -71,8 +71,9 @@ class DeviantartExtractor(Extractor): content = deviation["content"] if self.original and deviation["is_downloadable"]: self._update_content(deviation, content) - if content["src"].startswith("https://images-wixmp-"): - # see https://github.com/r888888888/danbooru/issues/4069 + if deviation["index"] <= 790677560 and \ + content["src"].startswith("https://images-wixmp-"): + # https://github.com/r888888888/danbooru/issues/4069 content["src"] = re.sub( r"(/f/[^/]+/[^/]+)/v\d+/.*", r"/intermediary\1", content["src"]) @@ -97,7 +98,8 @@ class DeviantartExtractor(Extractor): def prepare(self, deviation): """Adjust the contents of a Deviation-object""" try: - deviation["index"] = deviation["url"].rpartition("-")[2] + deviation["index"] = text.parse_int( + deviation["url"].rpartition("-")[2]) except KeyError: deviation["index"] = 0 if self.user: