merge #7327: [zzup] support 'w.zzup.com' URLs
This commit is contained in:
@@ -16,7 +16,7 @@ class ZzupGalleryExtractor(GalleryExtractor):
|
|||||||
filename_fmt = "{num:>03}.{extension}"
|
filename_fmt = "{num:>03}.{extension}"
|
||||||
archive_fmt = "{slug}_{num}"
|
archive_fmt = "{slug}_{num}"
|
||||||
root = "https://zzup.com"
|
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")
|
r"/[\w=]+/([^/?#]+)/[\w=]+)/(?:index|page-\d+)\.html")
|
||||||
example = "https://zzup.com/content/xyz=/12345_TITLE/123=/index.html"
|
example = "https://zzup.com/content/xyz=/12345_TITLE/123=/index.html"
|
||||||
|
|
||||||
|
|||||||
@@ -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",
|
"#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",
|
"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,
|
"num" : int,
|
||||||
"count" : 135,
|
"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",
|
"#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",
|
"#url" : "https://up.zzup.com/viewalbum/TE9MQUxVWlogLSBMYWxsaSAtIFdhcm0gYW5kIENvenk=/NTM0MTk=/OTgz/index.html",
|
||||||
"#category": ("", "zzup", "gallery"),
|
"#category": ("", "zzup", "gallery"),
|
||||||
|
|||||||
Reference in New Issue
Block a user