diff --git a/gallery_dl/extractor/urlgalleries.py b/gallery_dl/extractor/urlgalleries.py index bb800558..ebfeb9df 100644 --- a/gallery_dl/extractor/urlgalleries.py +++ b/gallery_dl/extractor/urlgalleries.py @@ -15,12 +15,15 @@ class UrlgalleriesGalleryExtractor(GalleryExtractor): category = "urlgalleries" root = "https://urlgalleries.net" request_interval = (0.5, 1.5) - pattern = r"(?:https?://)(?:(\w+)\.)?urlgalleries\.net/(?:[\w-]+-)?(\d+)" - example = "https://BLOG.urlgalleries.net/gallery-12345/TITLE" + pattern = (r"(?:https?://)()(?:(\w+)\.)?urlgalleries\.net" + r"/(?:b/([^/?#]+)/)?(?:[\w-]+-)?(\d+)") + example = "https://urlgalleries.net/b/BLOG/gallery-12345/TITLE" def items(self): - blog, self.gallery_id = self.groups - url = "https://{}.urlgalleries.net/porn-gallery-{}/?a=10000".format( + _, blog_alt, blog, self.gallery_id = self.groups + if not blog: + blog = blog_alt + url = "https://urlgalleries.net/b/{}/porn-gallery-{}/?a=10000".format( blog, self.gallery_id) with self.request(url, allow_redirects=False, fatal=...) as response: @@ -35,7 +38,7 @@ class UrlgalleriesGalleryExtractor(GalleryExtractor): data = self.metadata(page) data["count"] = len(imgs) - root = "https://{}.urlgalleries.net".format(blog) + root = "https://urlgalleries.net/b/" + blog yield Message.Directory, data for data["num"], img in enumerate(imgs, 1): page = self.request(root + img).text diff --git a/test/results/urlgalleries.py b/test/results/urlgalleries.py index 88a321e7..2d857468 100644 --- a/test/results/urlgalleries.py +++ b/test/results/urlgalleries.py @@ -8,6 +8,25 @@ from gallery_dl.extractor import urlgalleries __tests__ = ( +{ + "#url" : "https://urlgalleries.net/b/photos2q/porn-gallery-7851311/clarice-window-8", + "#category": ("", "urlgalleries", "gallery"), + "#class" : urlgalleries.UrlgalleriesGalleryExtractor, + "#range" : "1-3", + "#urls" : ( + "https://fappic.com/x207mqkn2463/4gq1yv.jpg", + "https://fappic.com/q684ua2rp0j9/4gq1xv.jpg", + "https://fappic.com/8vf3n8fgz9po/4gq1ya.jpg", + ), + + "blog" : "photos2q", + "count" : 39, + "date" : "dt:2023-12-08 13:59:00", + "gallery_id": "7851311", + "num" : range(1, 3), + "title" : "Clarice window 8", +}, + { "#url" : "https://photos2q.urlgalleries.net/porn-gallery-7851311/clarice-window-8", "#category": ("", "urlgalleries", "gallery"),