From da11fb32d0aa9262a2809a9712e501ea7ad15d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sun, 28 Aug 2022 00:16:12 +0200 Subject: [PATCH] update extractor test results --- gallery_dl/extractor/itaku.py | 11 ++++++----- gallery_dl/extractor/luscious.py | 4 +++- gallery_dl/extractor/philomena.py | 2 +- gallery_dl/extractor/poipiku.py | 4 ++-- gallery_dl/extractor/smugmug.py | 4 ++-- gallery_dl/extractor/tapas.py | 2 +- gallery_dl/extractor/unsplash.py | 4 ++-- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/gallery_dl/extractor/itaku.py b/gallery_dl/extractor/itaku.py index 6b2cf4c2..00a32cdc 100644 --- a/gallery_dl/extractor/itaku.py +++ b/gallery_dl/extractor/itaku.py @@ -101,9 +101,9 @@ class ItakuImageExtractor(ItakuExtractor): "/gallery_imgs/220504_oUNIAFT/xl.jpg", "liked_by_you": False, "maturity_rating": "SFW", - "num_comments": 2, - "num_likes": 80, - "num_reshares": 2, + "num_comments": int, + "num_likes": int, + "num_reshares": int, "obj_tags": 136446, "owner": 16775, "owner_avatar": "https://d1wmr8tlk3viaj.cloudfront.net" @@ -115,8 +115,9 @@ class ItakuImageExtractor(ItakuExtractor): "tags": list, "tags_character": ["hatsune_miku"], "tags_copyright": ["vocaloid"], - "tags_general" : ["twintails", "green_hair", "flag", "gloves", - "green_eyes", "female", "racing_miku"], + "tags_general" : ["female", "green_eyes", "twintails", + "green_hair", "gloves", "flag", + "racing_miku"], "title": "Racing Miku 2022 Ver.", "too_mature": False, "uncompressed_filesize": "0.62", diff --git a/gallery_dl/extractor/luscious.py b/gallery_dl/extractor/luscious.py index b5db3dd5..57db0c9d 100644 --- a/gallery_dl/extractor/luscious.py +++ b/gallery_dl/extractor/luscious.py @@ -49,7 +49,9 @@ class LusciousAlbumExtractor(LusciousExtractor): r"/(?:albums|pictures/c/[^/?#]+/album)/[^/?#]+_(\d+)") test = ( ("https://luscious.net/albums/okinami-no-koigokoro_277031/", { - "url": "7e4984a271a1072ac6483e4228a045895aff86f3", + "pattern": r"https://storage\.bhs\.cloud\.ovh\.net/v1/AUTH_\w+" + r"/images/NTRshouldbeillegal/277031" + r"/luscious_net_\d+_\d+\.jpg$", # "content": "b3a747a6464509440bd0ff6d1267e6959f8d6ff3", "keyword": { "album": { diff --git a/gallery_dl/extractor/philomena.py b/gallery_dl/extractor/philomena.py index fba13129..225f0ffc 100644 --- a/gallery_dl/extractor/philomena.py +++ b/gallery_dl/extractor/philomena.py @@ -122,7 +122,7 @@ class PhilomenaPostExtractor(PhilomenaExtractor): "tag_ids": list, "tags": list, "thumbnails_generated": True, - "updated_at": "2022-04-25T09:30:57Z", + "updated_at": r"re:\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ", "uploader": "Clover the Clever", "uploader_id": 211188, "upvotes": int, diff --git a/gallery_dl/extractor/poipiku.py b/gallery_dl/extractor/poipiku.py index 42c91d3c..8203885a 100644 --- a/gallery_dl/extractor/poipiku.py +++ b/gallery_dl/extractor/poipiku.py @@ -131,7 +131,7 @@ class PoipikuPostExtractor(PoipikuExtractor): pattern = BASE_PATTERN + r"/(\d+)/(\d+)" test = ( ("https://poipiku.com/25049/5864576.html", { - "pattern": r"https://img\.poipiku\.com/user_img03/000025049" + "pattern": r"https://img\.poipiku\.com/user_img\d+/000025049" r"/005864576_EWN1Y65gQ\.png$", "keyword": { "count": "1", @@ -146,7 +146,7 @@ class PoipikuPostExtractor(PoipikuExtractor): }, }), ("https://poipiku.com/2166245/6411749.html", { - "pattern": r"https://img\.poipiku\.com/user_img01/002166245" + "pattern": r"https://img\.poipiku\.com/user_img\d+/002166245" r"/006411749_\w+\.jpeg$", "count": 4, "keyword": { diff --git a/gallery_dl/extractor/smugmug.py b/gallery_dl/extractor/smugmug.py index 98e914e9..4010da33 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": "460a773f5addadd3e216bda346fc524fe4eedc52", + "keyword": "b31a63d07c9c26eb0f79f52d60d171a98938f99b", "content": "ecbd9d7b4f75a637abc8d35319be9ec065a44eb0", }), # video ("https://tstravels.smugmug.com/Dailies/Daily-Dose-2015/i-39JFNzB", { "url": "04d0ab1ff829ca7d78f5acb5548953df08e9a5ee", - "keyword": "eb74e5cf6780d5152ab8f11b431ec1b17fa8f69b", + "keyword": "4cef98133ace511adc874c9d9abac5817ba0d856", }), ) diff --git a/gallery_dl/extractor/tapas.py b/gallery_dl/extractor/tapas.py index fcdf18fa..545a95bb 100644 --- a/gallery_dl/extractor/tapas.py +++ b/gallery_dl/extractor/tapas.py @@ -108,7 +108,7 @@ class TapasSeriesExtractor(TapasExtractor): test = ( ("https://tapas.io/series/just-leave-me-be", { "pattern": r"https://\w+\.cloudfront\.net/pc/\w\w/[0-9a-f-]+\.jpg", - "count": 127, + "count": 132, }), ("https://tapas.io/series/yona", { # mature "count": 26, diff --git a/gallery_dl/extractor/unsplash.py b/gallery_dl/extractor/unsplash.py index c29d730d..623ed941 100644 --- a/gallery_dl/extractor/unsplash.py +++ b/gallery_dl/extractor/unsplash.py @@ -84,7 +84,7 @@ class UnsplashImageExtractor(UnsplashExtractor): "blur_hash": "LZP4uQS4jboe%#o0WCa}2doJNaaz", "categories": list, "color": "#f3c08c", - "created_at": "2020-04-08T08:29:42-04:00", + "created_at": "2020-04-08T12:29:42Z", "date": "dt:2020-04-08 12:29:42", "description": "The Island", "downloads": int, @@ -112,7 +112,7 @@ class UnsplashImageExtractor(UnsplashExtractor): }, "title": "Beaver Dam, WI 53916, USA" }, - "promoted_at": "2020-04-08T11:12:03-04:00", + "promoted_at": "2020-04-08T15:12:03Z", "sponsorship": None, "tags": list, "updated_at": str,