merge #5224: [artstation] update URL patterns to recognize usernames …

…with dashes
mikf · Feb 21, 2024 · b4c46de · b4c46de
2 parents fe7e228 + 962f55c
commit b4c46de
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/gallery_dl/extractor/artstation.py b/gallery_dl/extractor/artstation.py
@@ -175,7 +175,7 @@ class ArtstationUserExtractor(ArtstationExtractor):
     subcategory = "user"
     pattern = (r"(?:https?://)?(?:(?:www\.)?artstation\.com"
                r"/(?!artwork|projects|search)([^/?#]+)(?:/albums/all)?"
-               r"|((?!www)\w+)\.artstation\.com(?:/projects)?)/?$")
+               r"|((?!www)[\w-]+)\.artstation\.com(?:/projects)?)/?$")
     example = "https://www.artstation.com/USER"
 
     def projects(self):
@@ -192,7 +192,7 @@ class ArtstationAlbumExtractor(ArtstationExtractor):
     archive_fmt = "a_{album[id]}_{asset[id]}"
     pattern = (r"(?:https?://)?(?:(?:www\.)?artstation\.com"
                r"/(?!artwork|projects|search)([^/?#]+)"
-               r"|((?!www)\w+)\.artstation\.com)/albums/(\d+)")
+               r"|((?!www)[\w-]+)\.artstation\.com)/albums/(\d+)")
     example = "https://www.artstation.com/USER/albums/12345"
 
     def __init__(self, match):
@@ -355,7 +355,7 @@ class ArtstationImageExtractor(ArtstationExtractor):
     """Extractor for images from a single artstation project"""
     subcategory = "image"
     pattern = (r"(?:https?://)?(?:"
-               r"(?:\w+\.)?artstation\.com/(?:artwork|projects|search)"
+               r"(?:[\w-]+\.)?artstation\.com/(?:artwork|projects|search)"
                r"|artstn\.co/p)/(\w+)")
     example = "https://www.artstation.com/artwork/abcde"
 

diff --git a/test/results/artstation.py b/test/results/artstation.py
@@ -157,4 +157,25 @@
     "#count"   : ">= 40",
 },
 
+{
+    "#url"     : "https://fede-x-rojas.artstation.com/projects/WBdaZy",
+    "#comment" : "dash in username",
+    "#category": ("", "artstation", "image"),
+    "#class"   : artstation.ArtstationImageExtractor,
+},
+
+{
+    "#url"     : "https://fede-x-rojas.artstation.com/albums/8533110",
+    "#comment" : "dash in username",
+    "#category": ("", "artstation", "album"),
+    "#class"   : artstation.ArtstationAlbumExtractor,
+},
+
+{
+    "#url"     : "https://fede-x-rojas.artstation.com/",
+    "#comment" : "dash in username",
+    "#category": ("", "artstation", "user"),
+    "#class"   : artstation.ArtstationUserExtractor,
+},
+
 )