From 0ea80c0586dfa3c97bca2d1957a520b8dba1c81f Mon Sep 17 00:00:00 2001
From: astringa1234 <84209853+astringa1234@users.noreply.github.com>
Date: Tue, 8 Apr 2025 14:39:58 +0200
Subject: [PATCH] [zzup] support 'w.zzup.com' URLs

- zzup.py support for w.zzup
- fix pattern
- update tests
---
 gallery_dl/extractor/zzup.py |  2 +-
 test/results/zzup.py         | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/gallery_dl/extractor/zzup.py b/gallery_dl/extractor/zzup.py
index 05b12b49..20454b41 100644
--- a/gallery_dl/extractor/zzup.py
+++ b/gallery_dl/extractor/zzup.py
@@ -16,7 +16,7 @@ class ZzupGalleryExtractor(GalleryExtractor):
     filename_fmt = "{num:>03}.{extension}"
     archive_fmt = "{slug}_{num}"
     root = "https://zzup.com"
-    pattern = (r"(?:https?://)?(up\.|www\.)?zzup\.com(/(?:viewalbum|content)"
+    pattern = (r"(?:https?://)?(up\.|w+\.)?zzup\.com(/(?:viewalbum|content)"
                r"/[\w=]+/([^/?#]+)/[\w=]+)/(?:index|page-\d+)\.html")
     example = "https://zzup.com/content/xyz=/12345_TITLE/123=/index.html"
 
diff --git a/test/results/zzup.py b/test/results/zzup.py
index 73731b1a..ca242ae3 100644
--- a/test/results/zzup.py
+++ b/test/results/zzup.py
@@ -15,7 +15,7 @@ __tests__ = (
     "#pattern" : r"https://zzup\.com/[^/?#]+/showimage/zzup-8769086487/image00\d\d\d-5896498214-1-9689595623/MetArt-20080206_viki_c_sensazioni_by_ingret/9879560327/zzup.com.jpg",
 
     "slug"  : "MetArt_20080206_viki_c_sensazioni_by_ingret",
-    "title" : "MetArt 20080206 viki c sensazioni by ingret",
+    "title" : "MetArt [2008 02 06] Viki C - Sensazioni by ingret",
     "num"   : int,
     "count" : 135,
 },
@@ -27,6 +27,20 @@ __tests__ = (
     "#pattern" : r"https://zzup\.com/[^/?#]+/showimage/zzup-8769086487/image000\d\d-5896498214-40-9689595623/Courtesan/9879560327/zzup.com.jpg",
 },
 
+{
+    "#url"     : "https://www.zzup.com/content/NjM=/MetArt_20080206_viki_c_sensazioni_by_ingret/OTE=/index.html",
+    "#category": ("", "zzup", "gallery"),
+    "#class"   : zzup.ZzupGalleryExtractor,
+    "#pattern" : r"https://zzup\.com/[^/?#]+/showimage/zzup-8769086487/image\d+-5896498214-\d+-9689595623/[^/?#]+/9879560327/zzup.com.jpg",
+},
+
+{
+    "#url"     : "https://w.zzup.com/content/NjM=/MetArt_20080206_viki_c_sensazioni_by_ingret/OTE=/index.html",
+    "#category": ("", "zzup", "gallery"),
+    "#class"   : zzup.ZzupGalleryExtractor,
+    "#pattern" : r"https://zzup\.com/[^/?#]+/showimage/zzup-8769086487/image\d+-5896498214-\d+-9689595623/[^/?#]+/9879560327/zzup.com.jpg",
+},
+
 {
     "#url"     : "https://up.zzup.com/viewalbum/TE9MQUxVWlogLSBMYWxsaSAtIFdhcm0gYW5kIENvenk=/NTM0MTk=/OTgz/index.html",
     "#category": ("", "zzup", "gallery"),