From dc23cfd684a45990c1dbb0646d8ea37b07f91a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sat, 20 Mar 2021 00:10:53 +0100 Subject: [PATCH] [deviantart] use fallback for /intermediary/ URLs instead of checking availability with HEAD requests --- CHANGELOG.md | 2 ++ gallery_dl/extractor/deviantart.py | 6 ++---- gallery_dl/version.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0a9e4b2..4c08371b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## Unreleased + ## 1.17.1 - 2021-03-19 ### Additions - [architizer] add `project` and `firm` extractors ([#1369](https://github.com/mikf/gallery-dl/issues/1369)) diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index d81fdb56..5305697b 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -105,7 +105,8 @@ class DeviantartExtractor(Extractor): intermediary, count = re.subn( r"(/f/[^/]+/[^/]+)/v\d+/.*", r"/intermediary\1", content["src"], 1) - if count and self._check_url(intermediary): + if count: + deviation["_fallback"] = (content["src"],) content["src"] = intermediary if self.quality: content["src"] = re.sub( @@ -282,9 +283,6 @@ class DeviantartExtractor(Extractor): if mtype and mtype.startswith("image/"): content.update(data) - def _check_url(self, url): - return self.request(url, method="HEAD", fatal=False).status_code < 400 - def _limited_request(self, url, **kwargs): """Limits HTTP requests to one every 2 seconds""" kwargs["fatal"] = None diff --git a/gallery_dl/version.py b/gallery_dl/version.py index 545410e4..eb61ca24 100644 --- a/gallery_dl/version.py +++ b/gallery_dl/version.py @@ -6,4 +6,4 @@ # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. -__version__ = "1.17.1" +__version__ = "1.17.2-dev"