diff --git a/test/results/8chan.py b/test/results/8chan.py index f7be8148..7bdbdecc 100644 --- a/test/results/8chan.py +++ b/test/results/8chan.py @@ -73,7 +73,7 @@ __tests__ = ( "#category": ("", "8chan", "board"), "#class" : _8chan._8chanBoardExtractor, "#pattern" : _8chan._8chanThreadExtractor.pattern, - "#count" : 27, + "#count" : range(24, 28), }, { diff --git a/test/results/blogspot.py b/test/results/blogspot.py index 75ecff92..3c7beadc 100644 --- a/test/results/blogspot.py +++ b/test/results/blogspot.py @@ -12,7 +12,7 @@ __tests__ = ( "#url" : "https://julianbphotography.blogspot.com/2010/12/moon-rise.html", "#category": ("blogger", "blogspot", "post"), "#class" : blogger.BloggerPostExtractor, - "#urls" : "https://3.bp.blogspot.com/-zlJddJtJOUo/Tt4WooTPNtI/AAAAAAAABG8/dGT2cGp2E7Y/s0/Icy-Moonrise---For-Web.jpg", + "#urls" : "https://blogger.googleusercontent.com/img/b/R29vZ2xl/AVvXsEjH9WkPvLJq2moxKtyt3ieJZWSDFQwOi3PHRdlHVHEQHRwy-d86Jg6HWSMhxaa6EgvlXq-zDMmKM4kIPn27eJ9Hepk2X9e9HQhqwMfrT8RYTnFe65uexw7KSk5FdWHxRVp5crz3p_qph3Bj/s0/Icy-Moonrise---For-Web.jpg", "blog": { "date" : "dt:2010-11-21 18:19:42", @@ -43,7 +43,7 @@ __tests__ = ( "extension": "jpg", "filename" : "Icy-Moonrise---For-Web", "num" : 1, - "url" : "https://3.bp.blogspot.com/-zlJddJtJOUo/Tt4WooTPNtI/AAAAAAAABG8/dGT2cGp2E7Y/s0/Icy-Moonrise---For-Web.jpg", + "url" : "https://blogger.googleusercontent.com/img/b/R29vZ2xl/AVvXsEjH9WkPvLJq2moxKtyt3ieJZWSDFQwOi3PHRdlHVHEQHRwy-d86Jg6HWSMhxaa6EgvlXq-zDMmKM4kIPn27eJ9Hepk2X9e9HQhqwMfrT8RYTnFe65uexw7KSk5FdWHxRVp5crz3p_qph3Bj/s0/Icy-Moonrise---For-Web.jpg", }, { @@ -59,7 +59,7 @@ __tests__ = ( "#comment" : "new image domain (#2204)", "#category": ("blogger", "blogspot", "post"), "#class" : blogger.BloggerPostExtractor, - "#pattern" : "https://blogger.googleusercontent.com/img/a/.+=s0$", + "#pattern" : r"https://blogger\.googleusercontent\.com/img/.+=s0$", "#count" : 8, }, @@ -67,7 +67,7 @@ __tests__ = ( "#url" : "https://julianbphotography.blogspot.com/", "#category": ("blogger", "blogspot", "blog"), "#class" : blogger.BloggerBlogExtractor, - "#pattern" : r"https://\d\.bp\.blogspot\.com/.*/s0/[^.]+\.jpg", + "#pattern" : r"https://blogger\.googleusercontent\.com/img/.+/s0/", "#range" : "1-25", "#count" : 25, }, diff --git a/test/results/deviantart.py b/test/results/deviantart.py index a9727334..525206df 100644 --- a/test/results/deviantart.py +++ b/test/results/deviantart.py @@ -308,7 +308,7 @@ __tests__ = ( "target" : dict, "thumbs" : list, "title" : "Banner", - "url" : "https://sta.sh/0198jippkeys", + "url" : "https://www.deviantart.com/stash/0198jippkeys", "username" : "gdldev", }, @@ -589,7 +589,7 @@ __tests__ = ( "index" : int, "index_base36": r"re:^[0-9a-z]+$", - "url" : r"re:^https://sta.sh", + "url" : r"re:^https://www.deviantart.com/stash/\w+", }, { diff --git a/test/results/hentaifoundry.py b/test/results/hentaifoundry.py index 35c66f8a..386ec3cd 100644 --- a/test/results/hentaifoundry.py +++ b/test/results/hentaifoundry.py @@ -29,10 +29,11 @@ __tests__ = ( }, { - "#url" : "https://www.hentai-foundry.com/pictures/user/Evulchibi/scraps", + "#url" : "https://www.hentai-foundry.com/pictures/user/Ethevian/scraps", "#category": ("", "hentaifoundry", "scraps"), "#class" : hentaifoundry.HentaifoundryScrapsExtractor, - "#sha1_url": "7cd9c6ec6258c4ab8c44991f7731be82337492a7", + "#pattern" : r"https://pictures\.hentai-foundry\.com/e/Ethevian/.+", + "#count" : ">= 10", }, { diff --git a/test/results/hitomi.py b/test/results/hitomi.py index 9039525c..b2426b0b 100644 --- a/test/results/hitomi.py +++ b/test/results/hitomi.py @@ -5,6 +5,7 @@ # published by the Free Software Foundation. from gallery_dl.extractor import hitomi +from gallery_dl import exception __tests__ = ( @@ -47,9 +48,7 @@ __tests__ = ( "#comment" : "gallery with 'broken' redirect", "#category": ("", "hitomi", "gallery"), "#class" : hitomi.HitomiGalleryExtractor, - "#options" : {"format": "original"}, - "#pattern" : r"https://[a-c]b\.hitomi\.la/images/\d+/\d+/[0-9a-f]{64}\.jpg", - "#count" : 10, + "#exception": exception.NotFoundError, }, { diff --git a/test/results/kemonoparty.py b/test/results/kemonoparty.py index 1528f55f..b855e6cc 100644 --- a/test/results/kemonoparty.py +++ b/test/results/kemonoparty.py @@ -89,11 +89,10 @@ __tests__ = ( }, { - "#url" : "https://kemono.party/gumroad/user/trylsc/post/IURjT", - "#comment" : "kemono.party -> data.kemono.party", + "#url" : "https://kemono.su/gumroad/user/3101696181060/post/tOWyf", "#category": ("", "kemonoparty", "gumroad"), "#class" : kemonoparty.KemonopartyPostExtractor, - "#pattern" : r"https://kemono\.party/data/(a4/7b/a47bfe938d8c1682eef06e885927484cd8df1b.+\.jpg|c6/04/c6048f5067fd9dbfa7a8be565ac194efdfb6e4.+\.zip)", + "#urls" : "https://kemono.su/data/6f/13/6f1394b19516396ea520254350662c254bbea30c1e111fd4b0f042c61c426d07.zip", }, { diff --git a/test/results/mastodonsocial.py b/test/results/mastodonsocial.py index ffd46a41..8c22bcf3 100644 --- a/test/results/mastodonsocial.py +++ b/test/results/mastodonsocial.py @@ -82,9 +82,9 @@ __tests__ = ( "#class" : mastodon.MastodonFollowingExtractor, "#extractor": False, "#urls" : ( + "https://mastodon.ie/@RustyBertrand", "https://ravenation.club/@soundwarrior20", "https://mastodon.social/@0x4f", - "https://mastodon.social/@RustyBertrand", "https://mastodon.social/@christianselig", "https://saturation.social/@clive", "https://mastodon.social/@sjvn", diff --git a/test/results/misskeydesign.py b/test/results/misskeydesign.py index f12be9ff..3560597b 100644 --- a/test/results/misskeydesign.py +++ b/test/results/misskeydesign.py @@ -21,7 +21,7 @@ __tests__ = ( "#url" : "https://misskey.design/@blooddj@pawoo.net", "#category": ("misskey", "misskey.design", "user"), "#class" : misskey.MisskeyUserExtractor, - "#count" : 7, + "#count" : "> 30", }, { diff --git a/test/results/myhentaigallery.py b/test/results/myhentaigallery.py index 0fa4e558..a90e067a 100644 --- a/test/results/myhentaigallery.py +++ b/test/results/myhentaigallery.py @@ -12,7 +12,7 @@ __tests__ = ( "#url" : "https://myhentaigallery.com/g/16247", "#category": ("", "myhentaigallery", "gallery"), "#class" : myhentaigallery.MyhentaigalleryGalleryExtractor, - "#pattern" : r"https://images\.myhentaicomics\.com/m\w\w/images/[^/]+/original/\d+\.jpg", + "#pattern" : r"https://(cdn|images)\.myhentaicomics\.com/m\w\w/images/[^/]+/original/\d+\.jpg", "artist" : list, "count" : 11, diff --git a/test/results/naverwebtoon.py b/test/results/naverwebtoon.py index 179f85b4..36b67086 100644 --- a/test/results/naverwebtoon.py +++ b/test/results/naverwebtoon.py @@ -109,7 +109,7 @@ __tests__ = ( "#category": ("", "naverwebtoon", "comic"), "#class" : naverwebtoon.NaverwebtoonComicExtractor, "#pattern" : naverwebtoon.NaverwebtoonEpisodeExtractor.pattern, - "#count" : 25, + "#count" : 24, }, { diff --git a/test/results/omgmiamiswimwear.py b/test/results/omgmiamiswimwear.py index 27f4d54d..e92228da 100644 --- a/test/results/omgmiamiswimwear.py +++ b/test/results/omgmiamiswimwear.py @@ -15,11 +15,11 @@ __tests__ = ( }, { - "#url" : "https://www.omgmiamiswimwear.com/products/la-medusa-maxi-dress", + "#url" : "https://www.omgmiamiswimwear.com/products/snatch-me-waist-belt", "#category": ("shopify", "omgmiamiswimwear", "product"), "#class" : shopify.ShopifyProductExtractor, "#pattern" : r"https://cdn\.shopify\.com/s/files/1/1819/6171/", - "#count" : 5, + "#count" : 3, }, ) diff --git a/test/results/pornpics.py b/test/results/pornpics.py index 39ad6d28..6caf5dd1 100644 --- a/test/results/pornpics.py +++ b/test/results/pornpics.py @@ -17,6 +17,7 @@ __tests__ = ( "categories": [ "Outdoor", "MILF", + "Boots", "Amateur", "Sexy", ], diff --git a/test/results/raddle.py b/test/results/raddle.py index 24710e94..6b3ccde8 100644 --- a/test/results/raddle.py +++ b/test/results/raddle.py @@ -68,9 +68,8 @@ __tests__ = ( "#comment" : "Image post", "#category": ("postmill", "raddle", "post"), "#class" : postmill.PostmillPostExtractor, - "#sha1_url" : "48663f767ea258fcd545ab5aa0e734f98f434388", "#sha1_content": "431e938082c2b59c44888a83cfc711cd1f0e910a", - "#count" : 1, + "#urls" : "https://uploads-cdn.raddle.me/submission_images/30f4cf7d235d40c1daebf6dc2e58bef2a80bec2b5b2dab10f2021ea8e3f29e11.png", }, { @@ -79,7 +78,7 @@ __tests__ = ( "#category": ("postmill", "raddle", "post"), "#class" : postmill.PostmillPostExtractor, "#options" : {"save-link-post-body": True}, - "#pattern" : r"^(text:[\s\S]+|https://raddle\.me/submission_images/[0-9a-f]+\.png)$", + "#pattern" : r"^(text:[\s\S]+|https://(uploads-cdn\.)?raddle\.me/submission_images/[0-9a-f]+\.png)$", "#count" : 2, }, diff --git a/test/results/reddit.py b/test/results/reddit.py index e5cd1c5e..bd0f9fd7 100644 --- a/test/results/reddit.py +++ b/test/results/reddit.py @@ -46,6 +46,7 @@ __tests__ = ( "#class" : reddit.RedditHomeExtractor, "#range" : "1-20", "#count" : ">= 20", + "#archive" : False, }, { diff --git a/test/results/steamgriddb.py b/test/results/steamgriddb.py index 06c1c22b..8cb39d17 100644 --- a/test/results/steamgriddb.py +++ b/test/results/steamgriddb.py @@ -5,22 +5,16 @@ # published by the Free Software Foundation. from gallery_dl.extractor import steamgriddb +from gallery_dl import exception __tests__ = ( { "#url" : "https://www.steamgriddb.com/grid/368023", + "#comment" : "deleted", "#category": ("", "steamgriddb", "asset"), "#class" : steamgriddb.SteamgriddbAssetExtractor, - "#urls" : ("https://cdn2.steamgriddb.com/grid/" - "82fee171d62c044898d99ba0fddeb203.png"), - "#count" : 1, - "#sha1_content": "0bffaccae6f35f9fab529684a5b158d1cec4186b", - - "game": { - "id" : 5259324, - "name": "Helltaker", - }, + "#exception": exception.NotFoundError, }, { diff --git a/test/results/tumblr.py b/test/results/tumblr.py index 12374e4a..67896590 100644 --- a/test/results/tumblr.py +++ b/test/results/tumblr.py @@ -103,7 +103,7 @@ __tests__ = ( "date-max" : "2015-04-25T00:00:00", "date-min" : "2015-04-01T00:00:00", }, - "#count" : 193, + "#count" : 192, }, { diff --git a/test/results/twibooru.py b/test/results/twibooru.py index a3aec152..ff0919d6 100644 --- a/test/results/twibooru.py +++ b/test/results/twibooru.py @@ -44,7 +44,7 @@ __tests__ = ( "tag_ids" : list, "tags" : list, "thumbnails_generated": True, - "updated_at" : "2023-12-25T06:58:33.986Z", + "updated_at" : str, "upvotes" : int, "view_url" : "https://cdn.twibooru.org/img/2020/7/8/1/full.png", "width" : 576, diff --git a/test/results/twitter.py b/test/results/twitter.py index cc41d9ca..2d43ebf8 100644 --- a/test/results/twitter.py +++ b/test/results/twitter.py @@ -575,7 +575,7 @@ You’ll be able to receive four Galarian form Pokémon with Hidden Abilities, p "#category": ("", "twitter", "tweet"), "#class" : twitter.TwitterTweetExtractor, "#options" : {"cards": True}, - "#pattern" : r"https://pbs.twimg.com/card_img/174\d+/[\w-]+\?format=(jpg|png)&name=orig$", + "#pattern" : r"https://pbs.twimg.com/card_img/17\d+/[\w-]+\?format=(jpg|png)&name=orig$", "#range" : "1,3", }, diff --git a/test/results/unsplash.py b/test/results/unsplash.py index 0050bdce..8c529743 100644 --- a/test/results/unsplash.py +++ b/test/results/unsplash.py @@ -57,22 +57,7 @@ __tests__ = ( "slug" : "red-wooden-cross-on-gray-concrete-pathway-between-green-trees-during-daytime-kaoHI0iHJPM", "sponsorship": None, "subcategory": "image", - "tags" : [ - "japan", - "hakone", - "神奈川県 日本", - "torii", - "shrine", - "traditional", - "sunrise", - "hakone shrine", - "wallpaper", - "grey", - "arbour", - "outdoors", - "garden", - "gate", - ], + "tags" : list, "tags_preview": list, "topic_submissions": {}, "topics" : [], @@ -114,7 +99,7 @@ __tests__ = ( "total_photos" : 86, "total_promoted_photos": 24, "twitter_username" : None, - "updated_at" : "2023-11-27T07:10:52Z", + "updated_at" : str, "username" : "_______life_" }, "views": range(2000000, 10000000), diff --git a/test/results/vsco.py b/test/results/vsco.py index ed42f1fa..6fa9eb69 100644 --- a/test/results/vsco.py +++ b/test/results/vsco.py @@ -47,13 +47,11 @@ __tests__ = ( }, { - "#url" : "https://vsco.co/vscotest39/spaces", + "#url" : "https://vsco.co/missuri/spaces", "#category": ("", "vsco", "spaces"), "#class" : vsco.VscoSpacesExtractor, "#urls" : ( - "https://vsco.co/spaces/62991a535a9ee215340fa2b0", - "https://vsco.co/spaces/62b35bfb54f97cbfbd5c1e62", - "https://vsco.co/spaces/629674a6875ebddb8f1320c1", + "https://vsco.co/spaces/62e4934e6920440801d19f05", ), }, diff --git a/test/results/xbooru.py b/test/results/xbooru.py index 016958c9..784cd723 100644 --- a/test/results/xbooru.py +++ b/test/results/xbooru.py @@ -12,7 +12,7 @@ __tests__ = ( "#url" : "https://xbooru.com/index.php?page=post&s=list&tags=konoyan", "#category": ("gelbooru_v02", "xbooru", "tag"), "#class" : gelbooru_v02.GelbooruV02TagExtractor, - "#count" : 24, + "#count" : 25, }, { diff --git a/test/results/xhamster.py b/test/results/xhamster.py index 44675c50..72634e18 100644 --- a/test/results/xhamster.py +++ b/test/results/xhamster.py @@ -12,7 +12,7 @@ __tests__ = ( "#url" : "https://xhamster.com/photos/gallery/take-me-to-the-carwash-at-digitaldesire-15860946", "#category": ("", "xhamster", "gallery"), "#class" : xhamster.XhamsterGalleryExtractor, - "#pattern" : r"https://ic-ph-ah\.xhcdn\.com/a/\w+/webp/000/\d+/\d+/\d+_1000\.jpg$", + "#pattern" : r"https://ic-ph-\w+\.xhcdn\.com/a/\w+/webp/000/\d+/\d+/\d+_1000\.jpg$", "#count" : 19, "comments": int, @@ -58,7 +58,7 @@ __tests__ = ( "#url" : "https://jp.xhamster2.com/photos/gallery/take-me-to-the-carwash-at-digitaldesire-15860946", "#category": ("", "xhamster", "gallery"), "#class" : xhamster.XhamsterGalleryExtractor, - "#pattern" : r"https://ic-ph-ah\.xhcdn\.com/a/\w+/webp/000/\d+/\d+/\d+_1000\.jpg$", + "#pattern" : r"https://ic-ph-\w+\.xhcdn\.com/a/\w+/webp/000/\d+/\d+/\d+_1000\.jpg$", "#count" : 19, },