[vsco] update URL pattern (closes #410)

This commit is contained in:
Mike Fährmann
2019-09-08 11:37:27 +02:00
parent 1848788970
commit e7690ac694
2 changed files with 10 additions and 7 deletions

View File

@@ -151,7 +151,7 @@ class TwitterTimelineExtractor(TwitterExtractor):
"""Extractor for all images from a user's timeline""" """Extractor for all images from a user's timeline"""
subcategory = "timeline" subcategory = "timeline"
pattern = (r"(?:https?://)?(?:www\.|mobile\.)?twitter\.com" pattern = (r"(?:https?://)?(?:www\.|mobile\.)?twitter\.com"
r"/([^/?&#]+)/?(?:[?#].*)?$") r"/([^/?&#]+)/?(?:$|[?#])")
test = ( test = (
("https://twitter.com/supernaturepics", { ("https://twitter.com/supernaturepics", {
"range": "1-40", "range": "1-40",

View File

@@ -86,12 +86,15 @@ class VscoExtractor(Extractor):
class VscoUserExtractor(VscoExtractor): class VscoUserExtractor(VscoExtractor):
"""Extractor for images from a user on vsco.co""" """Extractor for images from a user on vsco.co"""
subcategory = "user" subcategory = "user"
pattern = BASE_PATTERN + r"/images/" pattern = BASE_PATTERN + r"(?:/images(?:/\d+)?)?/?(?:$|[?#])"
test = ("https://vsco.co/missuri/images/1", { test = (
"range": "1-80", ("https://vsco.co/missuri/images/1", {
"count": 80, "range": "1-80",
"pattern": r"https://im\.vsco\.co/[^/]+/[0-9a-f/]+/vsco\w+\.\w+", "count": 80,
}) "pattern": r"https://im\.vsco\.co/[^/]+/[0-9a-f/]+/vsco\w+\.\w+",
}),
("https://vsco.co/missuri"),
)
def images(self): def images(self):
url = "{}/{}/images/1".format(self.root, self.user) url = "{}/{}/images/1".format(self.root, self.user)