From 211de95dd0fb1a126920b74e2d87253cabda989d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Mon, 1 Nov 2021 02:58:53 +0100 Subject: [PATCH] update extractor test results --- gallery_dl/extractor/8muses.py | 2 +- gallery_dl/extractor/bcy.py | 5 +++-- gallery_dl/extractor/foolfuuka.py | 2 +- gallery_dl/extractor/hentaihand.py | 4 ++-- gallery_dl/extractor/hitomi.py | 4 ++-- gallery_dl/extractor/luscious.py | 2 +- gallery_dl/extractor/mangapark.py | 2 +- gallery_dl/extractor/paheal.py | 6 ++++-- gallery_dl/extractor/patreon.py | 2 +- gallery_dl/extractor/philomena.py | 4 ++-- gallery_dl/extractor/sankaku.py | 6 +++--- gallery_dl/extractor/slideshare.py | 2 +- gallery_dl/extractor/smugmug.py | 4 ++-- gallery_dl/extractor/tapas.py | 2 +- gallery_dl/extractor/xvideos.py | 5 ++++- 15 files changed, 29 insertions(+), 23 deletions(-) diff --git a/gallery_dl/extractor/8muses.py b/gallery_dl/extractor/8muses.py index c961ded1..3cd9c3ae 100644 --- a/gallery_dl/extractor/8muses.py +++ b/gallery_dl/extractor/8muses.py @@ -55,7 +55,7 @@ class _8musesAlbumExtractor(Extractor): }, }), # custom sorting - ("https://www.8muses.com/comics/album/Fakku-Comics/8?sort=az", { + ("https://www.8muses.com/comics/album/Fakku-Comics/9?sort=az", { "count": ">= 70", "keyword": {"name": r"re:^[R-Zr-z]"}, }), diff --git a/gallery_dl/extractor/bcy.py b/gallery_dl/extractor/bcy.py index f867bd9a..47e51b30 100644 --- a/gallery_dl/extractor/bcy.py +++ b/gallery_dl/extractor/bcy.py @@ -9,7 +9,7 @@ """Extractors for https://bcy.net/""" from .common import Extractor, Message -from .. import text +from .. import text, exception import json import re @@ -93,7 +93,7 @@ class BcyExtractor(Extractor): def _data_from_post(self, post_id): url = "{}/item/detail/{}".format(self.root, post_id) - page = self.request(url).text + page = self.request(url, notfound="post").text return json.loads( text.extract(page, 'JSON.parse("', '");')[0] .replace('\\\\u002F', '/') @@ -178,6 +178,7 @@ class BcyPostExtractor(BcyExtractor): }), # deleted ("https://bcy.net/item/detail/6780546160802143236", { + "exception": exception.NotFoundError, "count": 0, }), # only visible to logged in users diff --git a/gallery_dl/extractor/foolfuuka.py b/gallery_dl/extractor/foolfuuka.py index 9b89999b..d2c5e8f1 100644 --- a/gallery_dl/extractor/foolfuuka.py +++ b/gallery_dl/extractor/foolfuuka.py @@ -125,7 +125,7 @@ class FoolfuukaThreadExtractor(FoolfuukaExtractor): "url": "3ae1473f6916ac831efe5cc4d4e7d3298ce79406", }), ("https://boards.fireden.net/sci/thread/11264294/", { - "url": "3adfe181ee86a8c23021c705f623b3657a9b0a43", + "url": "61cab625c95584a12a30049d054931d64f8d20aa", }), ("https://archive.nyafuu.org/c/thread/2849220/", { "url": "bbe6f82944a45e359f5c8daf53f565913dc13e4f", diff --git a/gallery_dl/extractor/hentaihand.py b/gallery_dl/extractor/hentaihand.py index fa8e98bb..c423b183 100644 --- a/gallery_dl/extractor/hentaihand.py +++ b/gallery_dl/extractor/hentaihand.py @@ -22,12 +22,12 @@ class HentaihandGalleryExtractor(GalleryExtractor): (("https://hentaihand.com/en/comic/c75-takumi-na-muchi-choudenji-hou-" "no-aishi-kata-how-to-love-a-super-electromagnetic-gun-toaru-kagaku-" "no-railgun-english"), { - "pattern": r"https://cdn.hentaihand.com/.*/images/5669/\d+.jpg$", + "pattern": r"https://cdn.hentaihand.com/.*/images/360468/\d+.jpg$", "count": 50, "keyword": { "artists" : ["Takumi Na Muchi"], "date" : "dt:2014-06-28 00:00:00", - "gallery_id": 5669, + "gallery_id": 360468, "lang" : "en", "language" : "English", "parodies" : ["Toaru Kagaku No Railgun"], diff --git a/gallery_dl/extractor/hitomi.py b/gallery_dl/extractor/hitomi.py index 349c8485..a4ce9254 100644 --- a/gallery_dl/extractor/hitomi.py +++ b/gallery_dl/extractor/hitomi.py @@ -35,12 +35,12 @@ class HitomiGalleryExtractor(GalleryExtractor): }), # Game CG with scenes (#321) ("https://hitomi.la/galleries/733697.html", { - "url": "e057652b40629d3d72b0ef059c6ec7556417139c", + "url": "0cb629ab2bfe93d994a7972f68ad2a5a64ecc161", "count": 210, }), # fallback for galleries only available through /reader/ URLs ("https://hitomi.la/galleries/1045954.html", { - "url": "779b94b47d5f0c2341db03499270d2b5370196f6", + "url": "b420755d56a1135104ca8ca0765f44e290db70c3", "count": 1413, }), # gallery with "broken" redirect diff --git a/gallery_dl/extractor/luscious.py b/gallery_dl/extractor/luscious.py index 665d2576..6761b552 100644 --- a/gallery_dl/extractor/luscious.py +++ b/gallery_dl/extractor/luscious.py @@ -105,7 +105,7 @@ class LusciousAlbumExtractor(LusciousExtractor): "exception": exception.NotFoundError, }), ("https://members.luscious.net/albums/login-required_323871/", { - "count": 78, + "count": 64, }), ("https://www.luscious.net/albums/okinami_277031/"), ("https://members.luscious.net/albums/okinami_277031/"), diff --git a/gallery_dl/extractor/mangapark.py b/gallery_dl/extractor/mangapark.py index 4bd55728..a883b913 100644 --- a/gallery_dl/extractor/mangapark.py +++ b/gallery_dl/extractor/mangapark.py @@ -66,7 +66,7 @@ class MangaparkChapterExtractor(MangaparkBase, ChapterExtractor): (("https://mangapark.net/manga" "/gekkan-shoujo-nozaki-kun/i2067426/v7/c70/1"), { "count": 15, - "keyword": "8f18f1c977ebe049ef35e3a877eaaab97fb25274", + "keyword": "edc14993c4752cee3a76e09b2f024d40d854bfd1", }), ("https://mangapark.me/manga/gosu/i811615/c55/1"), ("https://mangapark.com/manga/gosu/i811615/c55/1"), diff --git a/gallery_dl/extractor/paheal.py b/gallery_dl/extractor/paheal.py index 05cbcdfe..ad9f620c 100644 --- a/gallery_dl/extractor/paheal.py +++ b/gallery_dl/extractor/paheal.py @@ -99,8 +99,10 @@ class PahealPostExtractor(PahealExtractor): pattern = (r"(?:https?://)?(?:rule34|rule63|cosplay)\.paheal\.net" r"/post/view/(\d+)") test = ("https://rule34.paheal.net/post/view/481609", { - "url": "a91d579be030753282f55b8cb4eeaa89c45a9116", - "keyword": "e02e4dcf8cdf4e9c206e695253c9024d79a2e20a", + "pattern": r"https://tulip\.paheal\.net/_images" + r"/bbdc1c33410c2cdce7556c7990be26b7/481609%20-%20" + r"Azumanga_Daioh%20Osaka%20Vuvuzela%20inanimate\.jpg", + "keyword": "abe7c1220ba5601f9639aa79fbb9689674ec8f5c", "content": "7b924bcf150b352ac75c9d281d061e174c851a11", }) diff --git a/gallery_dl/extractor/patreon.py b/gallery_dl/extractor/patreon.py index c7df0890..62e4f581 100644 --- a/gallery_dl/extractor/patreon.py +++ b/gallery_dl/extractor/patreon.py @@ -151,7 +151,7 @@ class PatreonExtractor(Extractor): included[file["type"]][file["id"]] for file in files["data"] ] - return () + return [] @memcache(keyarg=1) def _user(self, url): diff --git a/gallery_dl/extractor/philomena.py b/gallery_dl/extractor/philomena.py index c6c885c4..d3b3bb12 100644 --- a/gallery_dl/extractor/philomena.py +++ b/gallery_dl/extractor/philomena.py @@ -107,11 +107,11 @@ class PhilomenaPostExtractor(PhilomenaExtractor): "source_url": "https://www.deviantart.com/speccysy/art" "/Afternoon-Flight-215193985", "spoilered": False, - "tag_count": 39, + "tag_count": 42, "tag_ids": list, "tags": list, "thumbnails_generated": True, - "updated_at": "2021-07-13T14:22:40Z", + "updated_at": "2021-09-30T20:04:01Z", "uploader": "Clover the Clever", "uploader_id": 211188, "upvotes": int, diff --git a/gallery_dl/extractor/sankaku.py b/gallery_dl/extractor/sankaku.py index 2ea6f572..59e8be6a 100644 --- a/gallery_dl/extractor/sankaku.py +++ b/gallery_dl/extractor/sankaku.py @@ -78,8 +78,8 @@ class SankakuTagExtractor(SankakuExtractor): test = ( ("https://sankaku.app/?tags=bonocho", { "count": 5, - "pattern": r"https://c?s\.sankakucomplex\.com/data/[^/]{2}/[^/]{2}" - r"/[^/]{32}\.\w+\?e=\d+&m=[^&#]+", + "pattern": r"https://v\.sankakucomplex\.com/data/[^/]{2}/[^/]{2}" + r"/[^/]{32}\.\w+\?e=\d+&expires=\d+&m=[^&#]+", }), ("https://beta.sankakucomplex.com/?tags=bonocho"), ("https://chan.sankakucomplex.com/?tags=bonocho"), @@ -159,7 +159,7 @@ class SankakuPostExtractor(SankakuExtractor): }), # 'contentious_content' ("https://sankaku.app/post/show/21418978", { - "pattern": r"https://s\.sankakucomplex\.com" + "pattern": r"https://v\.sankakucomplex\.com" r"/data/13/3c/133cda3bfde249c504284493903fb985\.jpg", }), # empty tags (#1617) diff --git a/gallery_dl/extractor/slideshare.py b/gallery_dl/extractor/slideshare.py index a3c77e84..91386e8f 100644 --- a/gallery_dl/extractor/slideshare.py +++ b/gallery_dl/extractor/slideshare.py @@ -25,7 +25,7 @@ class SlidesharePresentationExtractor(Extractor): (("https://www.slideshare.net" "/Slideshare/get-started-with-slide-share"), { "url": "23685fb9b94b32c77a547d45dc3a82fe7579ea18", - "content": "ee54e54898778e92696a7afec3ffabdbd98eb0cc", + "content": "2e90a01c6ca225579ebf8f98ab46f97a28a5e45c", }), # long title (("https://www.slideshare.net/pragmaticsolutions/warum-sie-nicht-ihren" diff --git a/gallery_dl/extractor/smugmug.py b/gallery_dl/extractor/smugmug.py index f7408e60..5d582b50 100644 --- a/gallery_dl/extractor/smugmug.py +++ b/gallery_dl/extractor/smugmug.py @@ -111,13 +111,13 @@ class SmugmugImageExtractor(SmugmugExtractor): test = ( ("https://tdm.smugmug.com/Nature/Dove/i-kCsLJT6", { "url": "e6408fd2c64e721fd146130dceb56a971ceb4259", - "keyword": "05c8d50aa6ea08d458f83c38d7f9e92148362f0e", + "keyword": "b15af021186b7234cebcac758d2a4fd8462f9912", "content": "ecbd9d7b4f75a637abc8d35319be9ec065a44eb0", }), # video ("https://tstravels.smugmug.com/Dailies/Daily-Dose-2015/i-39JFNzB", { "url": "04d0ab1ff829ca7d78f5acb5548953df08e9a5ee", - "keyword": "720da317232504f05099da37802ed3c3ce3cd310", + "keyword": "f6967cc5a46c3e130a4f8de7c5c971f72e07fe61", }), ) diff --git a/gallery_dl/extractor/tapas.py b/gallery_dl/extractor/tapas.py index ec1e0441..9b06f92d 100644 --- a/gallery_dl/extractor/tapas.py +++ b/gallery_dl/extractor/tapas.py @@ -150,7 +150,7 @@ class TapasEpisodeExtractor(TapasExtractor): subcategory = "episode" pattern = BASE_PATTERN + r"/episode/(\d+)" test = ("https://tapas.io/episode/2068651", { - "url": "0e536117dfaa17972e83d2e0141e6f9e91a33611", + "url": "f122b05648a9f53c2ddb2f6854a7a80ab946e9e8", "pattern": "^text:", "keyword": { "book": True, diff --git a/gallery_dl/extractor/xvideos.py b/gallery_dl/extractor/xvideos.py index 59649a03..0922c7c4 100644 --- a/gallery_dl/extractor/xvideos.py +++ b/gallery_dl/extractor/xvideos.py @@ -31,7 +31,10 @@ class XvideosGalleryExtractor(XvideosBase, GalleryExtractor): r"/([^/?#]+)/photos/(\d+)") test = ( ("https://www.xvideos.com/profiles/pervertedcouple/photos/751031", { - "url": "cb4657a37eea5ab6b1d333491cee7eeb529b0645", + "count": 8, + "pattern": r"https://profile-pics-l3\.xvideos-cdn\.com" + r"/[0-9a-f]{40}-\d+/videos/profiles/galleries/84/ca/37" + r"/pervertedcouple/gal751031/pic_\d+_big\.jpg", "keyword": { "gallery": { "id" : 751031,