diff options
Diffstat (limited to 'gallery_dl/extractor/xhamster.py')
| -rw-r--r-- | gallery_dl/extractor/xhamster.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gallery_dl/extractor/xhamster.py b/gallery_dl/extractor/xhamster.py index 5f11df3..258e89c 100644 --- a/gallery_dl/extractor/xhamster.py +++ b/gallery_dl/extractor/xhamster.py @@ -33,7 +33,7 @@ class XhamsterGalleryExtractor(XhamsterExtractor): "{gallery[id]} {gallery[title]}") filename_fmt = "{num:>03}_{id}.{extension}" archive_fmt = "{id}" - pattern = BASE_PATTERN + r"(/photos/gallery/[^/?&#]+)" + pattern = BASE_PATTERN + r"(/photos/gallery/[^/?#]+)" test = ( ("https://xhamster.com/photos/gallery/11748968", { "pattern": r"https://thumb-p\d+.xhcdn.com/./[\w/-]+_1000.jpg$", @@ -152,7 +152,7 @@ class XhamsterGalleryExtractor(XhamsterExtractor): class XhamsterUserExtractor(XhamsterExtractor): """Extractor for all galleries of an xhamster user""" subcategory = "user" - pattern = BASE_PATTERN + r"/users/([^/?&#]+)(?:/photos)?/?(?:$|[?#])" + pattern = BASE_PATTERN + r"/users/([^/?#]+)(?:/photos)?/?(?:$|[?#])" test = ( ("https://xhamster.com/users/goldenpalomino/photos", { "pattern": XhamsterGalleryExtractor.pattern, @@ -174,7 +174,7 @@ class XhamsterUserExtractor(XhamsterExtractor): while url: extr = text.extract_from(self.request(url).text) while True: - url = extr('thumb-image-container" href="', '"') + url = extr('thumb-image-container role-pop" href="', '"') if not url: break yield Message.Queue, url, data |