From e7690ac69466093672183a7618d65d5121cb0814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sun, 8 Sep 2019 11:37:27 +0200 Subject: [PATCH] [vsco] update URL pattern (closes #410) --- gallery_dl/extractor/twitter.py | 2 +- gallery_dl/extractor/vsco.py | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py index 0bd25913..2fa69d59 100644 --- a/gallery_dl/extractor/twitter.py +++ b/gallery_dl/extractor/twitter.py @@ -151,7 +151,7 @@ class TwitterTimelineExtractor(TwitterExtractor): """Extractor for all images from a user's timeline""" subcategory = "timeline" pattern = (r"(?:https?://)?(?:www\.|mobile\.)?twitter\.com" - r"/([^/?&#]+)/?(?:[?#].*)?$") + r"/([^/?&#]+)/?(?:$|[?#])") test = ( ("https://twitter.com/supernaturepics", { "range": "1-40", diff --git a/gallery_dl/extractor/vsco.py b/gallery_dl/extractor/vsco.py index 639ec82d..6cc5911a 100644 --- a/gallery_dl/extractor/vsco.py +++ b/gallery_dl/extractor/vsco.py @@ -86,12 +86,15 @@ class VscoExtractor(Extractor): class VscoUserExtractor(VscoExtractor): """Extractor for images from a user on vsco.co""" subcategory = "user" - pattern = BASE_PATTERN + r"/images/" - test = ("https://vsco.co/missuri/images/1", { - "range": "1-80", - "count": 80, - "pattern": r"https://im\.vsco\.co/[^/]+/[0-9a-f/]+/vsco\w+\.\w+", - }) + pattern = BASE_PATTERN + r"(?:/images(?:/\d+)?)?/?(?:$|[?#])" + test = ( + ("https://vsco.co/missuri/images/1", { + "range": "1-80", + "count": 80, + "pattern": r"https://im\.vsco\.co/[^/]+/[0-9a-f/]+/vsco\w+\.\w+", + }), + ("https://vsco.co/missuri"), + ) def images(self): url = "{}/{}/images/1".format(self.root, self.user)