From c8e99e3b3b6936dd429a1af42be23ac4c6546621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sat, 7 Dec 2019 23:38:36 +0100 Subject: [PATCH] [deviantart] fix crash on missing "token" field (#505) --- gallery_dl/extractor/deviantart.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index 0ce7cbcd00..27037ceb8c 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -708,7 +708,8 @@ def _extract(self, data): else: src = media["baseUri"] - token = media["token"][0] + if "token" in media: + token = media["token"][0] if "c" in target: src += "/" + target["c"].replace( @@ -753,8 +754,10 @@ class DeviantartDeviationExtractor(DeviantartExtractorV2): "count": 0, }), (("https://www.deviantart.com/myria-moon/art/Aime-Moi-261986576"), { - "pattern": (r"https://www.deviantart.com/download/261986576" - r"/[\w-]+\.jpg\?token=\w+&ts=\d+"), + # "pattern": (r"https://www.deviantart.com/download/261986576" + # r"/[\w-]+\.jpg\?token=\w+&ts=\d+"), + "pattern": (r"https://images-wixmp-\w+\.wixmp\.com" + r"/intermediary/f/[^/]+/[^.]+\.jpg") }), # wixmp URL rewrite (("https://www.deviantart.com/citizenfresh/art/Hverarond-789295466"), { @@ -794,7 +797,8 @@ class DeviantartDeviationExtractor(DeviantartExtractorV2): }), # archive ("https://www.deviantart.com/itsvenue/art/-brush-pngs-14-763300948", { - "pattern": r"https://.+deviantart.com/download/763300948/.*\.rar", + # "pattern": r"https://.+deviantart.com/download/763300948/.*rar", + "pattern": r"https://images-wixmp-\w+\.wixmp\.com/i/.*\.png" }), # swf ("https://www.deviantart.com/ikatxfruti/art/Bang-Bang-528130222", {