diff --git a/gallery_dl/extractor/2chan.py b/gallery_dl/extractor/2chan.py index 9813f2bb..d34209fa 100644 --- a/gallery_dl/extractor/2chan.py +++ b/gallery_dl/extractor/2chan.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2017-2020 Mike Fährmann +# Copyright 2017-2021 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 @@ -22,8 +22,8 @@ class _2chanThreadExtractor(Extractor): url_fmt = "https://{server}.2chan.net/{board}/src/{filename}" pattern = r"(?:https?://)?([^.]+)\.2chan\.net/([^/]+)/res/(\d+)" test = ("http://dec.2chan.net/70/res/4752.htm", { - "url": "1c2d2ce8aea0fc71d94735cfc30009d628f33548", - "keyword": "f508d6841ea2cb19ed799aac9dc580263ca50651", + "url": "20c211ae7c06b18ec345a057fe0b68dde979b051", + "keyword": "23a529b46313b927fc94b577e5e1fdb3aa164ac1", }) def __init__(self, match): diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index a9c63a95..a58401eb 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2015-2020 Mike Fährmann +# Copyright 2015-2021 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 @@ -686,6 +686,8 @@ class DeviantartPopularExtractor(DeviantartExtractor): }), ("https://www.deviantart.com/popular-24-hours/?q=tree+house", { "options": (("original", False),), + "range": "1-30", + "count": 30, }), ("https://www.deviantart.com/search?q=tree"), ("https://www.deviantart.com/search/deviations?order=popular-1-week"), diff --git a/gallery_dl/extractor/mangadex.py b/gallery_dl/extractor/mangadex.py index 77f2c83f..2156ecf9 100644 --- a/gallery_dl/extractor/mangadex.py +++ b/gallery_dl/extractor/mangadex.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2018-2020 Mike Fährmann +# Copyright 2018-2021 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 @@ -77,7 +77,7 @@ class MangadexChapterExtractor(MangadexExtractor): }), # MANGA Plus (#1154) ("https://mangadex.org/chapter/1122815", { - "excepion": exception.StopExtraction, + "exception": exception.HttpError, }), ) diff --git a/gallery_dl/extractor/nozomi.py b/gallery_dl/extractor/nozomi.py index 328dc81a..4eb3ee68 100644 --- a/gallery_dl/extractor/nozomi.py +++ b/gallery_dl/extractor/nozomi.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2019-2020 Mike Fährmann +# Copyright 2019-2021 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 @@ -95,13 +95,11 @@ class NozomiPostExtractor(NozomiExtractor): "dataid" : "re:aaa9f7c632cde1e1a5baaff3fb6a6d857ec73df7fdc5", "date" : "dt:2016-07-26 02:32:03", "extension": "jpg", - "favorites": int, "filename" : str, "height" : 768, "is_video" : False, "postid" : 3649262, "source" : "danbooru", - "sourceid" : 2434215, "tags" : list, "type" : "jpg", "url" : str, diff --git a/gallery_dl/extractor/pixiv.py b/gallery_dl/extractor/pixiv.py index ee886bf4..a872ada0 100644 --- a/gallery_dl/extractor/pixiv.py +++ b/gallery_dl/extractor/pixiv.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2014-2020 Mike Fährmann +# Copyright 2014-2021 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 @@ -220,6 +220,7 @@ class PixivWorkExtractor(PixivExtractor): # related works (#1237) ("https://www.pixiv.net/artworks/966412", { "options": (("related", True),), + "range": "1-10", "count": ">= 10", }), ("https://www.pixiv.net/en/artworks/966412"), diff --git a/gallery_dl/extractor/unsplash.py b/gallery_dl/extractor/unsplash.py index e08bcbcd..7be20933 100644 --- a/gallery_dl/extractor/unsplash.py +++ b/gallery_dl/extractor/unsplash.py @@ -98,7 +98,7 @@ class UnsplashImageExtractor(UnsplashExtractor): "promoted_at": "2020-04-08T11:12:03-04:00", "sponsorship": None, "tags": list, - "updated_at": "2021-01-13T07:15:42-05:00", + "updated_at": str, "user": { "accepted_tos": True, "bio": str, @@ -109,11 +109,11 @@ class UnsplashImageExtractor(UnsplashExtractor): "location": "Madison, WI", "name": "Dave Hoefler", "portfolio_url": str, - "total_collections": 1, - "total_likes": 178, - "total_photos": 687, + "total_collections": int, + "total_likes": int, + "total_photos": int, "twitter_username": None, - "updated_at": "2021-01-13T21:50:35-05:00", + "updated_at": str, "username": "johnwestrock" }, "views": int, diff --git a/gallery_dl/extractor/webtoons.py b/gallery_dl/extractor/webtoons.py index 5d3ca89f..4449e190 100644 --- a/gallery_dl/extractor/webtoons.py +++ b/gallery_dl/extractor/webtoons.py @@ -47,7 +47,8 @@ class WebtoonsEpisodeExtractor(WebtoonsExtractor): (("https://www.webtoons.com/en/comedy/safely-endangered" "/ep-572-earth/viewer?title_no=352&episode_no=572"), { "url": "11041d71a3f92728305c11a228e77cf0f7aa02ef", - "content": "1ce950324f14018b691c42b0ede57fa25618abeb", + "content": ("1748c7e82b6db910fa179f6dc7c4281b0f680fa7", + "49e1f2def04c6f7a6a3dacf245a1cd9abe77a6a9"), "count": 5, }), )