From 47a780942c4221920f353aa3fe696511334d086d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Fri, 3 Sep 2021 01:01:59 +0200 Subject: [PATCH] update extractor test results --- gallery_dl/extractor/deviantart.py | 2 +- gallery_dl/extractor/dynastyscans.py | 2 +- gallery_dl/extractor/gfycat.py | 2 +- gallery_dl/extractor/hitomi.py | 6 +++--- gallery_dl/extractor/imagefap.py | 11 +++++++---- gallery_dl/extractor/pornhub.py | 4 ++-- gallery_dl/extractor/seisoparty.py | 2 +- gallery_dl/extractor/unsplash.py | 4 ++-- 8 files changed, 18 insertions(+), 15 deletions(-) diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index 21270d95..b4ac742f 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -332,7 +332,7 @@ class DeviantartExtractor(Extractor): self.log.info( "Watching %s for premium folder access", username) else: - self.warning.info( + self.log.warning( "Error when trying to watch %s. " "Try again with a new refresh-token", username) else: diff --git a/gallery_dl/extractor/dynastyscans.py b/gallery_dl/extractor/dynastyscans.py index d491a6d1..4541d25d 100644 --- a/gallery_dl/extractor/dynastyscans.py +++ b/gallery_dl/extractor/dynastyscans.py @@ -136,7 +136,7 @@ class DynastyscansImageExtractor(DynastyscansSearchExtractor): pattern = BASE_PATTERN + r"/images/(\d+)" test = ("https://dynasty-scans.com/images/1245", { "url": "15e54bd94148a07ed037f387d046c27befa043b2", - "keyword": "3b630c6139e5ff06e141541d57960f8a2957efbb", + "keyword": "0d8976c2d6fbc9ed6aa712642631b96e456dc37f", }) def images(self): diff --git a/gallery_dl/extractor/gfycat.py b/gallery_dl/extractor/gfycat.py index 57328166..6d31f7dc 100644 --- a/gallery_dl/extractor/gfycat.py +++ b/gallery_dl/extractor/gfycat.py @@ -102,7 +102,7 @@ class GfycatImageExtractor(GfycatExtractor): "keyword": { "gfyId": "graygenerouscowrie", "gfyName": "GrayGenerousCowrie", - "gfyNumber": "755075459", + "gfyNumber": 755075459, "title": "Bottom's up", "username": "jackson3oh3", "createDate": 1495884169, diff --git a/gallery_dl/extractor/hitomi.py b/gallery_dl/extractor/hitomi.py index 7c338a88..01e56297 100644 --- a/gallery_dl/extractor/hitomi.py +++ b/gallery_dl/extractor/hitomi.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 @@ -35,12 +35,12 @@ class HitomiGalleryExtractor(GalleryExtractor): }), # Game CG with scenes (#321) ("https://hitomi.la/galleries/733697.html", { - "url": "1de8510bd4c3048a1cbbf242505d8449e93ba5a4", + "url": "e057652b40629d3d72b0ef059c6ec7556417139c", "count": 210, }), # fallback for galleries only available through /reader/ URLs ("https://hitomi.la/galleries/1045954.html", { - "url": "681bb07d8ce4d0c4d0592e47b239b6e42d566386", + "url": "779b94b47d5f0c2341db03499270d2b5370196f6", "count": 1413, }), # gallery with "broken" redirect diff --git a/gallery_dl/extractor/imagefap.py b/gallery_dl/extractor/imagefap.py index efc6d2a2..7922e845 100644 --- a/gallery_dl/extractor/imagefap.py +++ b/gallery_dl/extractor/imagefap.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2016-2020 Mike Fährmann +# Copyright 2016-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 @@ -36,12 +36,14 @@ class ImagefapGalleryExtractor(ImagefapExtractor): test = ( ("https://www.imagefap.com/pictures/7102714", { - "pattern": r"https://cdn.imagefap.com/images/full/\d+/\d+/\d+.jpg", + "pattern": r"https://cdnh\.imagefap\.com" + r"/images/full/\d+/\d+/\d+\.jpg", "keyword": "2ba96e84c2952c4750e9fa94a3f2b1f965cec2f3", "content": "694a0a57385980a6f90fbc296cadcd6c11ba2dab", }), ("https://www.imagefap.com/gallery/5486966", { - "pattern": r"https://cdn.imagefap.com/images/full/\d+/\d+/\d+.jpg", + "pattern": r"https://cdnh\.imagefap\.com" + r"/images/full/\d+/\d+/\d+\.jpg", "keyword": "3e24eace5b09639b881ebd393165862feb46adde", }), ("https://www.imagefap.com/gallery.php?gid=7102714"), @@ -105,7 +107,8 @@ class ImagefapImageExtractor(ImagefapExtractor): pattern = BASE_PATTERN + r"/photo/(\d+)" test = ( ("https://www.imagefap.com/photo/1369341772/", { - "pattern": r"https://cdn.imagefap.com/images/full/\d+/\d+/\d+.jpg", + "pattern": r"https://cdnh\.imagefap\.com" + r"/images/full/\d+/\d+/\d+\.jpg", "keyword": "8894e45f7262020d8d66ce59917315def1fc475b", }), ("https://beta.imagefap.com/photo/1369341772/"), diff --git a/gallery_dl/extractor/pornhub.py b/gallery_dl/extractor/pornhub.py index e9094268..f976e821 100644 --- a/gallery_dl/extractor/pornhub.py +++ b/gallery_dl/extractor/pornhub.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2019 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 @@ -31,7 +31,7 @@ class PornhubGalleryExtractor(PornhubExtractor): test = ( ("https://www.pornhub.com/album/19289801", { "pattern": r"https://\w+.phncdn.com/pics/albums/\d+/\d+/\d+/\d+/", - "count": 308, + "count": ">= 300", "keyword": { "id" : int, "num" : int, diff --git a/gallery_dl/extractor/seisoparty.py b/gallery_dl/extractor/seisoparty.py index feda7f1e..28e049b6 100644 --- a/gallery_dl/extractor/seisoparty.py +++ b/gallery_dl/extractor/seisoparty.py @@ -105,7 +105,7 @@ class SeisopartyPostExtractor(SeisopartyExtractor): "url": "75f13b92de0ce399b6163c3de18f1f36011c2366", "count": 2, "keyword": { - "content": "この前描いためぐるちゃんのPSDファイルです。\n" + "content": "この前描いためぐるちゃんのPSDファイルです。
" "どうぞよろしくお願いします。", "date": "dt:2021-05-06 12:38:31", "extension": "re:psd|jpg", diff --git a/gallery_dl/extractor/unsplash.py b/gallery_dl/extractor/unsplash.py index 6cfc69e4..16779293 100644 --- a/gallery_dl/extractor/unsplash.py +++ b/gallery_dl/extractor/unsplash.py @@ -115,13 +115,13 @@ class UnsplashImageExtractor(UnsplashExtractor): "id": "uMJXuywXLiU", "instagram_username": "just_midwest_rock", "last_name": "Hoefler", - "location": None, + "location": "Madison, WI", "name": "Dave Hoefler", "portfolio_url": str, "total_collections": int, "total_likes": int, "total_photos": int, - "twitter_username": None, + "twitter_username": "dave_hoefler", "updated_at": str, "username": "davehoefler", },