diff options
Diffstat (limited to 'gallery_dl/extractor/vsco.py')
| -rw-r--r-- | gallery_dl/extractor/vsco.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gallery_dl/extractor/vsco.py b/gallery_dl/extractor/vsco.py index df09fce..b8da813 100644 --- a/gallery_dl/extractor/vsco.py +++ b/gallery_dl/extractor/vsco.py @@ -12,7 +12,7 @@ from .common import Extractor, Message, Dispatch from .. import text, util BASE_PATTERN = r"(?:https?://)?(?:www\.)?vsco\.co" -USER_PATTERN = BASE_PATTERN + r"/([^/?#]+)" +USER_PATTERN = rf"{BASE_PATTERN}/([^/?#]+)" class VscoExtractor(Extractor): @@ -22,7 +22,7 @@ class VscoExtractor(Extractor): directory_fmt = ("{category}", "{user}") filename_fmt = "{id}.{extension}" archive_fmt = "{id}" - tls12 = False + browser = "firefox" def __init__(self, match): Extractor.__init__(self, match) @@ -30,7 +30,7 @@ class VscoExtractor(Extractor): def items(self): videos = self.config("videos", True) - yield Message.Directory, {"user": self.user} + yield Message.Directory, "", {"user": self.user} for img in self.images(): if not img: @@ -62,7 +62,7 @@ class VscoExtractor(Extractor): "grid" : img["grid_name"], "meta" : img.get("image_meta") or {}, "tags" : [tag["text"] for tag in img.get("tags") or ()], - "date" : text.parse_timestamp(img["upload_date"] // 1000), + "date" : self.parse_timestamp(img["upload_date"] // 1000), "video" : img["is_video"], "width" : img["width"], "height": img["height"], @@ -133,7 +133,7 @@ class VscoExtractor(Extractor): class VscoUserExtractor(Dispatch, VscoExtractor): """Extractor for a vsco user profile""" - pattern = USER_PATTERN + r"/?$" + pattern = rf"{USER_PATTERN}/?$" example = "https://vsco.co/USER" def items(self): @@ -149,7 +149,7 @@ class VscoUserExtractor(Dispatch, VscoExtractor): class VscoGalleryExtractor(VscoExtractor): """Extractor for a vsco user's gallery""" subcategory = "gallery" - pattern = USER_PATTERN + r"/(?:gallery|images)" + pattern = rf"{USER_PATTERN}/(?:gallery|images)" example = "https://vsco.co/USER/gallery" def images(self): @@ -173,7 +173,7 @@ class VscoCollectionExtractor(VscoExtractor): subcategory = "collection" directory_fmt = ("{category}", "{user}", "collection") archive_fmt = "c_{user}_{id}" - pattern = USER_PATTERN + r"/collection" + pattern = rf"{USER_PATTERN}/collection" example = "https://vsco.co/USER/collection/1" def images(self): @@ -198,7 +198,7 @@ class VscoSpaceExtractor(VscoExtractor): subcategory = "space" directory_fmt = ("{category}", "space", "{user}") archive_fmt = "s_{user}_{id}" - pattern = BASE_PATTERN + r"/spaces/([^/?#]+)" + pattern = rf"{BASE_PATTERN}/spaces/([^/?#]+)" example = "https://vsco.co/spaces/a1b2c3d4e5f" def images(self): @@ -245,7 +245,7 @@ class VscoSpaceExtractor(VscoExtractor): class VscoSpacesExtractor(VscoExtractor): """Extractor for a vsco.co user's spaces""" subcategory = "spaces" - pattern = USER_PATTERN + r"/spaces" + pattern = rf"{USER_PATTERN}/spaces" example = "https://vsco.co/USER/spaces" def items(self): @@ -275,7 +275,7 @@ class VscoSpacesExtractor(VscoExtractor): class VscoAvatarExtractor(VscoExtractor): """Extractor for vsco.co user avatars""" subcategory = "avatar" - pattern = USER_PATTERN + r"/avatar" + pattern = rf"{USER_PATTERN}/avatar" example = "https://vsco.co/USER/avatar" def images(self): @@ -303,7 +303,7 @@ class VscoAvatarExtractor(VscoExtractor): class VscoImageExtractor(VscoExtractor): """Extractor for individual images on vsco.co""" subcategory = "image" - pattern = USER_PATTERN + r"/media/([0-9a-fA-F]+)" + pattern = rf"{USER_PATTERN}/media/([0-9a-fA-F]+)" example = "https://vsco.co/USER/media/0123456789abcdef" def images(self): @@ -316,7 +316,7 @@ class VscoImageExtractor(VscoExtractor): class VscoVideoExtractor(VscoExtractor): """Extractor for vsco.co videos links""" subcategory = "video" - pattern = USER_PATTERN + r"/video/([^/?#]+)" + pattern = rf"{USER_PATTERN}/video/([^/?#]+)" example = "https://vsco.co/USER/video/012345678-9abc-def0" def images(self): |