New upstream version 1.13.2upstream/1.13.2

1 files changed, 11 insertions, 5 deletions

diff --git a/gallery_dl/extractor/vsco.py b/gallery_dl/extractor/vsco.py
index a24d3fe..a020064 100644
--- a/gallery_dl/extractor/vsco.py
+++ b/gallery_dl/extractor/vsco.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2019 Mike Fährmann
+# Copyright 2019-2020 Mike Fährmann
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -34,6 +34,9 @@ class VscoExtractor(Extractor):
         yield Message.Directory, {"user": self.user}
         for img in self.images():
 
+            if not img or "responsive_url" not in img:
+                continue
+
             if img["is_video"]:
                 if not videos:
                     continue
@@ -98,6 +101,8 @@ class VscoExtractor(Extractor):
 
     @staticmethod
     def _transform_media(media):
+        if "responsiveUrl" not in media:
+            return None
         media["_id"] = media["id"]
         media["is_video"] = media["isVideo"]
         media["grid_name"] = media["gridName"]
@@ -111,18 +116,19 @@ class VscoExtractor(Extractor):
 class VscoUserExtractor(VscoExtractor):
     """Extractor for images from a user on vsco.co"""
     subcategory = "user"
-    pattern = BASE_PATTERN + r"(?:/images(?:/\d+)?)?/?(?:$|[?#])"
+    pattern = BASE_PATTERN + r"(?:/gallery|/images(?:/\d+)?)?/?(?:$|[?#])"
     test = (
-        ("https://vsco.co/missuri/images/1", {
+        ("https://vsco.co/missuri/gallery", {
             "pattern": r"https://image(-aws.+)?\.vsco\.co/[0-9a-f/]+/vsco\w+",
             "range": "1-80",
             "count": 80,
         }),
+        ("https://vsco.co/missuri/images/1"),
         ("https://vsco.co/missuri"),
     )
 
     def images(self):
-        url = "{}/{}/images/1".format(self.root, self.user)
+        url = "{}/{}/gallery".format(self.root, self.user)
         data = self._extract_preload_state(url)
 
         tkn = data["users"]["currentUser"]["tkn"]
@@ -186,7 +192,7 @@ class VscoImageExtractor(VscoExtractor):
                 "grid"  : "erenyildiz",
                 "meta"  : dict,
                 "tags"  : list,
-                "date"  : "type:datetime",
+                "date"  : "dt:2019-07-21 19:12:11",
                 "video" : False,
                 "width" : 1537,
                 "height": 1537,