From 5716430c35a52300889b54a6422f4018b8142dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Fri, 15 Mar 2024 18:14:55 +0100 Subject: [PATCH] =?UTF-8?q?[deviantart:stash]=20recognize=20'deviantart.co?= =?UTF-8?q?m/stash/=E2=80=A6'=20URLs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gallery_dl/extractor/deviantart.py | 3 ++- test/results/deviantart.py | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index a22417a8..bb74929c 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -678,7 +678,8 @@ class DeviantartStashExtractor(DeviantartExtractor): """Extractor for sta.sh-ed deviations""" subcategory = "stash" archive_fmt = "{index}.{extension}" - pattern = r"(?:https?://)?sta\.sh/([a-z0-9]+)" + pattern = (r"(?:https?://)?(?:(?:www\.)?deviantart\.com/stash|sta\.sh)" + r"/([a-z0-9]+)") example = "https://sta.sh/abcde" skip = Extractor.skip diff --git a/test/results/deviantart.py b/test/results/deviantart.py index 1bb5ecdd..a9727334 100644 --- a/test/results/deviantart.py +++ b/test/results/deviantart.py @@ -361,7 +361,7 @@ __tests__ = ( }, { - "#url" : "https://sta.sh/022c83odnaxc", + "#url" : "https://www.deviantart.com/stash/022c83odnaxc", "#category": ("", "deviantart", "stash"), "#class" : deviantart.DeviantartStashExtractor, "#pattern" : r"https://wixmp-ed30a86b8c4ca887773594c2.wixmp.com/f/940f2d05-c5eb-4917-8192-7eb6a2d508c6/dcvdmbc-e506cdcf-3208-4c20-85ab-0bfa8a7bcb16.png\?token=ey.+", @@ -388,6 +388,12 @@ __tests__ = ( "url" : "https://www.deviantart.com/stash/022c83odnaxc", }, +{ + "#url" : "https://sta.sh/022c83odnaxc", + "#category": ("", "deviantart", "stash"), + "#class" : deviantart.DeviantartStashExtractor, +}, + { "#url" : "https://sta.sh/21jf51j7pzl2", "#comment" : "multiple stash items",