From a416d4c3d5b5b315342d19514085006c47bcc323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Thu, 18 Jan 2024 16:05:41 +0100
Subject: [PATCH] [sankaku] support post URLs with alphanumeric IDs (#5073)

---
 gallery_dl/extractor/sankaku.py |  2 +-
 test/results/sankaku.py         | 35 ++++++++++++++++++++++++++-------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/gallery_dl/extractor/sankaku.py b/gallery_dl/extractor/sankaku.py
index 602895c4f3..b3b7a9cc00 100644
--- a/gallery_dl/extractor/sankaku.py
+++ b/gallery_dl/extractor/sankaku.py
@@ -143,7 +143,7 @@ class SankakuPostExtractor(SankakuExtractor):
     """Extractor for single posts from sankaku.app"""
     subcategory = "post"
     archive_fmt = "{id}"
-    pattern = BASE_PATTERN + r"/posts?(?:/show)?/([0-9a-f]+)"
+    pattern = BASE_PATTERN + r"/posts?(?:/show)?/(\w+)"
     example = "https://sankaku.app/post/show/12345"
 
     def __init__(self, match):
diff --git a/test/results/sankaku.py b/test/results/sankaku.py
index 89396daad2..361fd7a28d 100644
--- a/test/results/sankaku.py
+++ b/test/results/sankaku.py
@@ -118,18 +118,38 @@
 },
 
 {
-    "#url"     : "https://sankaku.app/post/show/360451",
+    "#url"     : "https://sankaku.app/posts/y0abGlDOr2o",
     "#category": ("booru", "sankaku", "post"),
     "#class"   : sankaku.SankakuPostExtractor,
     "#options"     : {"tags": True},
     "#sha1_content": "5e255713cbf0a8e0801dc423563c34d896bb9229",
 
-    "tags_artist"   : ["bonocho"],
-    "tags_studio"   : ["dc_comics"],
-    "tags_medium"   : list,
-    "tags_copyright": list,
-    "tags_character": list,
-    "tags_general"  : list,
+    "tags_artist": [
+        "bonocho",
+    ],
+    "tags_character": [
+        "batman",
+        "letty_whiterock",
+        "bruce_wayne",
+        "the_joker",
+        "heath_ledger",
+    ],
+    "tags_copyright": [
+        "batman_(series)",
+        "the_dark_knight",
+    ],
+    "tags_studio": [
+        "dc_comics",
+    ],
+    "tags_general": list,
+},
+
+{
+    "#url"     : "https://sankaku.app/post/show/360451",
+    "#comment" : "legacy post URL",
+    "#category": ("booru", "sankaku", "post"),
+    "#class"   : sankaku.SankakuPostExtractor,
+    "#pattern" : r"https://s\.sankakucomplex\.com/data/ac/8e/ac8e3b92ea328ce9cf7211e69c905bf9\.jpg\?e=.+",
 },
 
 {
@@ -137,6 +157,7 @@
     "#comment" : "'contentious_content'",
     "#category": ("booru", "sankaku", "post"),
     "#class"   : sankaku.SankakuPostExtractor,
+    "#auth"    : True,
     "#pattern" : r"https://s\.sankakucomplex\.com/data/13/3c/133cda3bfde249c504284493903fb985\.jpg",
 },