diff options
Diffstat (limited to 'gallery_dl/extractor/subscribestar.py')
| -rw-r--r-- | gallery_dl/extractor/subscribestar.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gallery_dl/extractor/subscribestar.py b/gallery_dl/extractor/subscribestar.py index ae8b58d..69e3854 100644 --- a/gallery_dl/extractor/subscribestar.py +++ b/gallery_dl/extractor/subscribestar.py @@ -38,12 +38,11 @@ class SubscribestarExtractor(Extractor): self.login() for post_html in self.posts(): media = self._media_from_post(post_html) - if not media: - continue data = self._data_from_post(post_html) yield Message.Directory, data - for item in media: + for num, item in enumerate(media, 1): item.update(data) + item["num"] = num text.nameext_from_url(item.get("name") or item["url"], item) yield Message.Url, item["url"], item @@ -140,8 +139,7 @@ class SubscribestarUserExtractor(SubscribestarExtractor): test = ( ("https://www.subscribestar.com/subscribestar", { "count": ">= 20", - "pattern": r"https://(star-uploads|ss-uploads-prod)\.s\d+-us-west-" - r"\d+\.amazonaws\.com/uploads(_v2)?/users/11/", + "pattern": r"https://\w+\.cloudfront\.net/uploads(_v2)?/users/11/", "keyword": { "author_id": 11, "author_name": "subscribestar", @@ -149,6 +147,7 @@ class SubscribestarUserExtractor(SubscribestarExtractor): "content": str, "date" : "type:datetime", "id" : int, + "num" : int, "post_id": int, "type" : "re:image|video|attachment", "url" : str, @@ -190,7 +189,7 @@ class SubscribestarPostExtractor(SubscribestarExtractor): pattern = BASE_PATTERN + r"/posts/(\d+)" test = ( ("https://www.subscribestar.com/posts/102468", { - "url": "612da5a98af056dd78dc846fbcfa705e721f6675", + "count": 1, "keyword": { "author_id": 11, "author_name": "subscribestar", @@ -202,6 +201,7 @@ class SubscribestarPostExtractor(SubscribestarExtractor): "group": "imgs_and_videos", "height": 291, "id": 203885, + "num": 1, "pinned": False, "post_id": 102468, "type": "image", @@ -209,7 +209,7 @@ class SubscribestarPostExtractor(SubscribestarExtractor): }, }), ("https://subscribestar.adult/posts/22950", { - "url": "440d745a368e6b3e218415f593a5045f384afa0d", + "count": 1, "keyword": {"date": "dt:2019-04-28 07:32:00"}, }), ) |