From d110dfd2da0d12fb2cb9abb0495d20eaf5afa939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Mon, 27 Jan 2025 16:14:23 +0100 Subject: [PATCH] [tests] update extractor results --- test/results/2ch.py | 4 ++-- test/results/4chan.py | 6 +++--- test/results/batoto.py | 2 +- test/results/danbooru.py | 18 +++++++++++------- test/results/derpibooru.py | 2 +- test/results/dynastyscans.py | 11 +++++++++-- test/results/e621.py | 15 ++++++++++++--- test/results/fanbox.py | 2 +- test/results/gelbooru.py | 4 ++-- test/results/hatenablog.py | 2 +- test/results/imagechest.py | 2 +- test/results/imgkiwi.py | 2 +- test/results/itaku.py | 8 ++++---- test/results/jpgfish.py | 6 +++--- test/results/kemonoparty.py | 2 +- test/results/khinsider.py | 2 +- test/results/lensdump.py | 2 +- test/results/luscious.py | 2 +- test/results/mangadex.py | 1 + test/results/mangalife.py | 2 +- test/results/manganelo.py | 15 ++++++++++++++- test/results/motherless.py | 4 ++-- test/results/naverwebtoon.py | 2 +- test/results/nijie.py | 31 ++----------------------------- test/results/patreon.py | 10 +++------- test/results/pornpics.py | 19 +++++++++++-------- test/results/redgifs.py | 2 +- test/results/rule34vault.py | 2 +- test/results/rule34xyz.py | 32 ++++++++++---------------------- test/results/safebooru.py | 2 +- test/results/saint.py | 12 ++++++------ test/results/sexcom.py | 8 ++++---- test/results/slideshare.py | 2 +- test/results/snootbooru.py | 4 ++-- test/results/steamgriddb.py | 4 ++-- test/results/subscribestar.py | 8 ++++---- test/results/tapas.py | 2 +- test/results/tcbscans.py | 14 +++++++++----- test/results/twibooru.py | 13 ++++++++++--- test/results/unsplash.py | 1 - test/results/vk.py | 2 +- test/results/warosu.py | 4 ++-- test/results/yiffverse.py | 6 +++--- test/results/zerochan.py | 2 +- test/results/zzup.py | 4 ++-- 45 files changed, 152 insertions(+), 148 deletions(-) diff --git a/test/results/2ch.py b/test/results/2ch.py index ad35adaa..00f9fdb8 100644 --- a/test/results/2ch.py +++ b/test/results/2ch.py @@ -22,7 +22,7 @@ __tests__ = ( "comment" : str, "date" : "type:datetime", "displayname": str, - "email" : "", + "email" : str, "endless" : 1, "extension": str, "filename" : str, @@ -36,7 +36,7 @@ __tests__ = ( "op" : 0, "parent" : int, "path" : r"re:/a/src/6202876/\d+\.\w+", - "post_name": "Аноним", + "post_name": str, "size" : int, "sticky" : 0, "subject" : str, diff --git a/test/results/4chan.py b/test/results/4chan.py index 6219e165..231928ac 100644 --- a/test/results/4chan.py +++ b/test/results/4chan.py @@ -14,8 +14,8 @@ __tests__ = ( "#category": ("", "4chan", "thread"), "#class" : _4chan._4chanThreadExtractor, "#sha1_url" : "39082ad166161966d7ba8e37f2173a824eb540f0", - "#sha1_metadata": "7ae2f4049adf0d2f835eb91b6b26b7f4ec882e0a", - "#sha1_content" : "551e432d52700ff3711f14752124e9af86ecbbdf", + "#sha1_metadata": "2cadd32796492baca25f5060dc95e9f4e24a0ff2", + "#sha1_content" : "742c6d256c813b29f246e1d765bba949fc3ac453", }, { @@ -23,7 +23,7 @@ __tests__ = ( "#category": ("", "4chan", "thread"), "#class" : _4chan._4chanThreadExtractor, "#sha1_url" : "39082ad166161966d7ba8e37f2173a824eb540f0", - "#sha1_metadata": "7ae2f4049adf0d2f835eb91b6b26b7f4ec882e0a", + "#sha1_metadata": "2cadd32796492baca25f5060dc95e9f4e24a0ff2", }, { diff --git a/test/results/batoto.py b/test/results/batoto.py index 65c8401c..a64d064e 100644 --- a/test/results/batoto.py +++ b/test/results/batoto.py @@ -135,7 +135,7 @@ __tests__ = ( "#class" : batoto.BatotoMangaExtractor, "#count" : ">= 29", - "manga": "Grand Duke Dan Putri Rubah [cont by LUNABY]", + "manga": "The Grand Duke’s Fox Princess [cont by LUNABY]", }, { diff --git a/test/results/danbooru.py b/test/results/danbooru.py index 3a857dbb..7f6cb0cb 100644 --- a/test/results/danbooru.py +++ b/test/results/danbooru.py @@ -81,7 +81,7 @@ __tests__ = ( "date": "dt:2008-08-12 04:46:05", "down_score": 0, "extension": "jpg", - "fav_count": 9, + "fav_count": range(9, 15), "file_ext": "jpg", "file_size": 358232, "file_url": "https://cdn.donmai.us/original/ac/8e/ac8e3b92ea328ce9cf7211e69c905bf9.jpg", @@ -107,20 +107,20 @@ __tests__ = ( "pixiv_id": 1129835, "preview_file_url": "https://cdn.donmai.us/180x180/ac/8e/ac8e3b92ea328ce9cf7211e69c905bf9.jpg", "rating": "s", - "score": 1, + "score": range(1, 5), "source": "https://i.pximg.net/img-original/img/2008/07/09/16/10/23/1129835_p0.jpg", "subcategory": "post", - "tag_count": 32, + "tag_count": range(32, 40), "tag_count_artist": 1, "tag_count_character": 3, "tag_count_copyright": 3, - "tag_count_general": 23, + "tag_count_general": range(23, 30), "tag_count_meta": 2, - "tag_string": "2boys bat_(animal) batman batman_(series) black_bodysuit bodysuit bonocho brown_eyes closed_mouth collared_shirt commentary_request copyright_name dc_comics expressionless facepaint glasgow_smile heath_ledger joker_(dc) male_focus multiple_boys outline outstretched_arm parted_lips photoshop_(medium) pink_shirt shirt sketch smile the_dark_knight upper_body white_outline wing_collar", + "tag_string": "2boys bat_(animal) batman batman_(series) black_bodysuit bodysuit bonocho brown_eyes card closed_mouth collared_shirt commentary_request copyright_name dc_comics expressionless facepaint glasgow_smile heath_ledger joker_(dc) male_focus multiple_boys outline outstretched_arm parted_lips photoshop_(medium) pink_shirt playing_card shirt sketch smile the_dark_knight upper_body white_outline wing_collar", "tag_string_artist": "bonocho", "tag_string_character": "batman heath_ledger joker_(dc)", "tag_string_copyright": "batman_(series) dc_comics the_dark_knight", - "tag_string_general": "2boys bat_(animal) black_bodysuit bodysuit brown_eyes closed_mouth collared_shirt copyright_name expressionless facepaint glasgow_smile male_focus multiple_boys outline outstretched_arm parted_lips pink_shirt shirt sketch smile upper_body white_outline wing_collar", + "tag_string_general": "2boys bat_(animal) black_bodysuit bodysuit brown_eyes card closed_mouth collared_shirt copyright_name expressionless facepaint glasgow_smile male_focus multiple_boys outline outstretched_arm parted_lips pink_shirt playing_card shirt sketch smile upper_body white_outline wing_collar", "tag_string_meta": "commentary_request photoshop_(medium)", "tags": [ "2boys", @@ -131,6 +131,7 @@ __tests__ = ( "bodysuit", "bonocho", "brown_eyes", + "card", "closed_mouth", "collared_shirt", "commentary_request", @@ -148,6 +149,7 @@ __tests__ = ( "parted_lips", "photoshop_(medium)", "pink_shirt", + "playing_card", "shirt", "sketch", "smile", @@ -175,6 +177,7 @@ __tests__ = ( "black_bodysuit", "bodysuit", "brown_eyes", + "card", "closed_mouth", "collared_shirt", "copyright_name", @@ -187,6 +190,7 @@ __tests__ = ( "outstretched_arm", "parted_lips", "pink_shirt", + "playing_card", "shirt", "sketch", "smile", @@ -199,7 +203,7 @@ __tests__ = ( "photoshop_(medium)", ], "up_score": range(1, 5), - "updated_at": "2022-07-11T23:42:31.881-04:00", + "updated_at": "2024-03-24T13:25:30.456-04:00", "uploader_id": 67005, }, diff --git a/test/results/derpibooru.py b/test/results/derpibooru.py index 4fe775bb..a9a40b6c 100644 --- a/test/results/derpibooru.py +++ b/test/results/derpibooru.py @@ -60,7 +60,7 @@ __tests__ = ( "#comment" : "svg (#5643)", "#category": ("philomena", "derpibooru", "post"), "#class" : philomena.PhilomenaPostExtractor, - "#urls" : "https://derpicdn.net/img/view/2024/4/1/3334658__safe_alternate+version_artist-colon-jp_derpibooru+exclusive_twilight+sparkle_alicorn_pony_amending+fences_g4_season+5_-dot-svg+available_female_grin_lo.svg", + "#urls" : "https://derpicdn.net/img/view/2024/4/1/3334658__safe_alternate+version_artist-colon-jp_derpibooru+exclusive_twilight+sparkle_alicorn_pony_amending+fences_g4_my+little+pony-colon-+friendship+is+magic_.svg", "#sha1_content": "eec5adf02e2a4fe83b9211c0444d57dc03e21f50", "extension": "svg", diff --git a/test/results/dynastyscans.py b/test/results/dynastyscans.py index 0d408800..111048d5 100644 --- a/test/results/dynastyscans.py +++ b/test/results/dynastyscans.py @@ -36,8 +36,15 @@ __tests__ = ( "#url" : "https://dynasty-scans.com/images?with[]=4930&with[]=5211", "#category": ("", "dynastyscans", "search"), "#class" : dynastyscans.DynastyscansSearchExtractor, - "#sha1_url" : "d2422163db7b1db94bf343f8cd50ba9cc08ae6b5", - "#sha1_metadata": "65f9948e7f29a1db2b3e6abb697f7476d2196708", + + "#sha1_metadata": "67690b4e21f59746f112803cba4c4d81fcbb9dbd", + "#urls" : ( + "https://dynasty-scans.com/system/images_images/000/032/932/full/66051624_p0.webp", + "https://dynasty-scans.com/system/images_images/000/021/368/full/KEIGI_32-1467964487873486851-img1.webp", + "https://dynasty-scans.com/system/images_images/000/004/596/full/tortoise.webp", + "https://dynasty-scans.com/system/images_images/000/003/206/full/1f01f72e19b98bf0083d323e3c28e4bf.webp", + "https://dynasty-scans.com/system/images_images/000/000/535/full/8564987.webp", + ), }, { diff --git a/test/results/e621.py b/test/results/e621.py index b4b431b4..b6d9add1 100644 --- a/test/results/e621.py +++ b/test/results/e621.py @@ -90,16 +90,25 @@ __tests__ = ( "creator_id" : 1077440, "creator_name": "Yeetus90", "description" : """\ -* "Little Legends":/pools/27971\r -* Little Legends 2\r +[quote]h2.【web再録】ぷち・れじぇんず2 +2015年の関西けもケット4で頒布した個人誌第2弾！ +～行方不明になった親友のビクティニを救うべく怪しげな館に単身乗り込んだミュウ。 +しかし彼女の前には強大な力を持つ館の主が立ちはだかる！果たして二人は無事脱出することができるのか！？～ + \n\ +この頃の方が背景に力が入ってますねw +あとジャローダの顔の模様思いっきり間違ってますがそこはご愛嬌ということで…[/quote] + +* "Little Legends":/pools/27971 +* Little Legends 2 * "Little Legends 3":/pools/27481\ """, + "id" : 27492, "is_active" : False, "name" : "Little Legends 2", "post_count" : 39, "post_ids" : list, - "updated_at" : "2022-03-27T06:30:03.382-04:00", + "updated_at" : "2025-01-07T22:01:40.319-05:00", }, ], }, diff --git a/test/results/fanbox.py b/test/results/fanbox.py index f11747f2..818c1294 100644 --- a/test/results/fanbox.py +++ b/test/results/fanbox.py @@ -135,7 +135,7 @@ __tests__ = ( "creatorId": "saki9184", "fee" : 350, "id" : "414274", - "title" : "入り浸りJKハルヒ", + "title" : "涼宮ハルヒの同人部", }, }, diff --git a/test/results/gelbooru.py b/test/results/gelbooru.py index 3f09ea69..4f5fb4c5 100644 --- a/test/results/gelbooru.py +++ b/test/results/gelbooru.py @@ -44,7 +44,7 @@ __tests__ = ( "#comment" : "meta tags (#5478)", "#category": ("booru", "gelbooru", "tag"), "#class" : gelbooru.GelbooruTagExtractor, - "#count" : 187, + "#count" : range(180, 190), }, { @@ -52,7 +52,7 @@ __tests__ = ( "#comment" : "meta + sort tags (#5478)", "#category": ("booru", "gelbooru", "tag"), "#class" : gelbooru.GelbooruTagExtractor, - "#count" : 187, + "#count" : range(180, 190), }, { diff --git a/test/results/hatenablog.py b/test/results/hatenablog.py index 4a306f9a..25840bf5 100644 --- a/test/results/hatenablog.py +++ b/test/results/hatenablog.py @@ -85,7 +85,7 @@ __tests__ = ( "#url" : "https://moko0908.hatenablog.jp/archive/2023", "#category": ("", "hatenablog", "archive"), "#class" : hatenablog.HatenablogArchiveExtractor, - "#count" : 13, + "#count" : range(10, 15), }, { diff --git a/test/results/imagechest.py b/test/results/imagechest.py index 41254a39..e1959be3 100644 --- a/test/results/imagechest.py +++ b/test/results/imagechest.py @@ -46,7 +46,7 @@ __tests__ = ( "#category": ("", "imagechest", "user"), "#class" : imagechest.ImagechestUserExtractor, "#pattern" : imagechest.ImagechestGalleryExtractor.pattern, - "#count" : 279, + "#count" : range(280, 290), }, ) diff --git a/test/results/imgkiwi.py b/test/results/imgkiwi.py index 16a4aa96..541958c3 100644 --- a/test/results/imgkiwi.py +++ b/test/results/imgkiwi.py @@ -45,7 +45,7 @@ __tests__ = ( "#category": ("chevereto", "imgkiwi", "user"), "#class" : chevereto.CheveretoUserExtractor, "#pattern" : chevereto.CheveretoAlbumExtractor.pattern, - "#count" : 50, + "#count" : range(155, 175), }, ) diff --git a/test/results/itaku.py b/test/results/itaku.py index 5a95bd84..5af54250 100644 --- a/test/results/itaku.py +++ b/test/results/itaku.py @@ -54,13 +54,13 @@ __tests__ = ( "tags" : list, "tags_character" : ["hatsune_miku"], "tags_copyright" : ["vocaloid"], - "tags_general": [ + "tags_general" : [ + "female", + "green_eyes", "twintails", "green_hair", - "flag", "gloves", - "green_eyes", - "female", + "flag", "racing_miku", ], "title" : "Racing Miku 2022 Ver.", diff --git a/test/results/jpgfish.py b/test/results/jpgfish.py index bef1d6e0..0cb1e2dd 100644 --- a/test/results/jpgfish.py +++ b/test/results/jpgfish.py @@ -12,14 +12,14 @@ __tests__ = ( "#url" : "https://jpg4.su/img/funnymeme.LecXGS", "#category": ("chevereto", "jpgfish", "image"), "#class" : chevereto.CheveretoImageExtractor, - "#urls" : "https://simp3.host.church/images/funnymeme.jpg", + "#urls" : "https://simp3.jpg5.su/images/funnymeme.jpg", "#sha1_content": "098e5e9b17ad634358426e0ffd1c93871474d13c", "album" : "", "extension": "jpg", "filename" : "funnymeme", "id" : "LecXGS", - "url" : "https://simp3.host.church/images/funnymeme.jpg", + "url" : "https://simp3.jpg5.su/images/funnymeme.jpg", "user" : "exearco", }, @@ -27,7 +27,7 @@ __tests__ = ( "#url" : "https://jpg.church/img/auCruA", "#category": ("chevereto", "jpgfish", "image"), "#class" : chevereto.CheveretoImageExtractor, - "#pattern" : r"https://simp2\.host\.church/hannahowo_00457\.jpg", + "#pattern" : r"https://simp2\.jpg5\.su/hannahowo_00457\.jpg", "album": "401-500", }, diff --git a/test/results/kemonoparty.py b/test/results/kemonoparty.py index ac1f41b5..b0d29de6 100644 --- a/test/results/kemonoparty.py +++ b/test/results/kemonoparty.py @@ -51,7 +51,7 @@ __tests__ = ( "https://kemono.su/data/b0/38/b03882c8b0ab3b1cf9fc658a2bb2f9ac6ad4f3449015311dcd2d7ee7f748db31.png", ), - "tags": r"\bpin-up\b", + "tags": r"re:\bpin-up\b", }, { diff --git a/test/results/khinsider.py b/test/results/khinsider.py index 1fc2e3d8..73927cec 100644 --- a/test/results/khinsider.py +++ b/test/results/khinsider.py @@ -81,7 +81,7 @@ __tests__ = ( "catalog" : "PCCG-00357", "count" : 36, "date" : "Jul 1st, 2024", - "developer": "Nintendo", + "developer": "", "name" : "Super Mario 64 Original Soundtrack", "platform" : ["N64"], "publisher": "Nintendo", diff --git a/test/results/lensdump.py b/test/results/lensdump.py index 91f633c0..5a566089 100644 --- a/test/results/lensdump.py +++ b/test/results/lensdump.py @@ -26,7 +26,7 @@ __tests__ = ( "#comment" : "2 pages", "#class" : lensdump.LensdumpAlbumExtractor, "#pattern" : r"https://[abcd]\.l3n\.co/i/\w{6}\.(jpe?g|png)", - "#count" : 64, + "#count" : range(68, 80), }, { diff --git a/test/results/luscious.py b/test/results/luscious.py index 5e7a1460..597b5699 100644 --- a/test/results/luscious.py +++ b/test/results/luscious.py @@ -20,7 +20,7 @@ __tests__ = ( "__typename" : "Album", "audiences" : list, "content" : "Hentai", - "cover" : r"re:https://storage\.bhs\.cloud\.ovh\.net/v1/.+/277031/", + "cover" : str, "created" : 1479625853, "created_by" : "Hive Mind", "date" : "dt:2016-11-20 07:10:53", diff --git a/test/results/mangadex.py b/test/results/mangadex.py index 817b0941..6f30c8d0 100644 --- a/test/results/mangadex.py +++ b/test/results/mangadex.py @@ -144,6 +144,7 @@ __tests__ = ( "#url" : "https://mangadex.org/author/7222d0d5-836c-4bf3-9174-72bceade8c87/kotoyama", "#class" : mangadex.MangadexAuthorExtractor, "#urls" : ( + "https://mangadex.org/title/ef4ead73-57a7-4d10-95b3-de73cfdd2670", "https://mangadex.org/title/259dfd8a-f06a-4825-8fa6-a2dcd7274230", "https://mangadex.org/title/d0c88e3b-ea64-4e07-9841-c1d2ac982f4a", "https://mangadex.org/title/f48bbb5f-8a23-4dea-8177-eb2dbbcbf4fa", diff --git a/test/results/mangalife.py b/test/results/mangalife.py index 80226afe..a8d86b3b 100644 --- a/test/results/mangalife.py +++ b/test/results/mangalife.py @@ -21,7 +21,7 @@ __tests__ = ( "chapter_minor" : "", "chapter_string": "110630", "count" : 13, - "date" : "dt:2022-10-16 17:32:54", + "date" : "dt:2024-03-29 15:07:00", "extension" : "png", "filename" : r"re:1063-0\d\d", "genre" : [ diff --git a/test/results/manganelo.py b/test/results/manganelo.py index b5772656..7236e47c 100644 --- a/test/results/manganelo.py +++ b/test/results/manganelo.py @@ -14,7 +14,20 @@ __tests__ = ( "#class" : manganelo.ManganeloChapterExtractor, "#pattern" : r"https://v\d+\.mkklcdnv6tempv5\.com/img/tab_17/03/23/39/gn983696/vol_3_chapter_23_24_yen/\d+-[no]\.jpg", "#count" : 25, - "#sha1_metadata": "17faaea7f0fb8c2675a327bf3aa0bcd7a6311d68", + + "author" : "Ei Yuzuki,Maki Hayashi", + "chapter" : 23, + "chapter_minor": "", + "count" : 25, + "date" : None, + "extension": "jpg", + "filename" : str, + "lang" : "en", + "language" : "English", + "manga" : "By Spring", + "page" : range(1, 25), + "title" : "24 Yen", + "volume" : 3, }, { diff --git a/test/results/motherless.py b/test/results/motherless.py index 4e372b2b..df34207c 100644 --- a/test/results/motherless.py +++ b/test/results/motherless.py @@ -89,7 +89,7 @@ __tests__ = ( "#range" : "1-100", "#count" : 100, - "count" : 6503, + "count" : range(5000, 8000), "extension" : {"jpg", "png", "gif"}, "filename" : str, "gallery_id" : "43D8704", @@ -110,7 +110,7 @@ __tests__ = ( "#range" : "1-100", "#count" : 100, - "count" : 869, + "count" : range(500, 900), "extension" : "mp4", "filename" : str, "gallery_id" : "43D8704", diff --git a/test/results/naverwebtoon.py b/test/results/naverwebtoon.py index 36b67086..fa969a1f 100644 --- a/test/results/naverwebtoon.py +++ b/test/results/naverwebtoon.py @@ -117,7 +117,7 @@ __tests__ = ( "#category": ("", "naverwebtoon", "comic"), "#class" : naverwebtoon.NaverwebtoonComicExtractor, "#pattern" : naverwebtoon.NaverwebtoonEpisodeExtractor.pattern, - "#count" : ">= 12", + "#count" : 1, }, ) diff --git a/test/results/nijie.py b/test/results/nijie.py index 829b6201..0ce9a258 100644 --- a/test/results/nijie.py +++ b/test/results/nijie.py @@ -124,37 +124,10 @@ __tests__ = ( { "#url" : "https://nijie.info/view.php?id=594044", + "#comment" : "404", "#category": ("Nijie", "nijie", "image"), "#class" : nijie.NijieImageExtractor, - "#urls": ( - "https://pic.nijie.net/02/nijie/23m12/09/49509/illust/0_0_63568cc428259d50_45ca51.jpg", - "https://pic.nijie.net/01/nijie/23m12/09/49509/illust/594044_0_1c94b7cc4503589f_79c66c.jpg", - "https://pic.nijie.net/02/nijie/23m12/09/49509/illust/594044_1_9f4737ad48bf43c7_8f1e8e.jpg", - "https://pic.nijie.net/01/nijie/23m12/09/49509/illust/594044_2_a162861fac970a45_38c5f8.jpg", - ), - - "artist_id" : 49509, - "artist_name": "黒川　竜", - "count" : 4, - "date" : "dt:2023-12-02 04:19:29", - "description": "【DLサイトコム】ウィンターセール　30%OFF\r\n期間：2024年2月14日まで\r\n【toloveるドリンク】\r\nhttps://www.dlsite.com/maniax/work/=/product_id/RJ042727.html\r\n【toloveるドリンク２】\r\nhttps://www.dlsite.com/maniax/work/=/product_id/RJ043289.html\r\n【クランクランBIG】\r\nhttps://www.dlsite.com/maniax/work/=/product_id/RJ043564.html", - "image_id" : 594044, - "num" : range(0, 3), - "tags" : [ - "オリジナル", - "漫画", - "中出し", - "爆乳", - "巨乳", - "ToLOVEる", - "宣伝", - "クラン・クラン", - "マクロスF", - ], - "title" : "【DLサイトコム】ウィンターセール", - "url" : str, - "user_id" : 49509, - "user_name" : "黒川　竜", + "#count" : 0, }, { diff --git a/test/results/patreon.py b/test/results/patreon.py index 075045ac..ab7bf951 100644 --- a/test/results/patreon.py +++ b/test/results/patreon.py @@ -82,13 +82,9 @@ __tests__ = ( { "#url" : "https://www.patreon.com/posts/free-mari-8s-113049301", - "#comment" : "postfile + attachments_media (#6241)", + "#comment" : "'This page has been removed' - postfile + attachments_media (#6241)", "#class" : patreon.PatreonPostExtractor, - "#pattern" : [ - r"https://c10\.patreonusercontent\.com/4/patreon-media/p/post/113049301/7ae4fd78d3374d849a80863f3d8eee89/eyJhIjoxLCJwIjoxfQ%3D%3D/1\.jpg", - r"https://c10\.patreonusercontent\.com/4/patreon-media/p/post/113049301/b6ea96b18cbc47f78f9334d50d0877ea/eyJhIjoxLCJwIjoxfQ%3D%3D/1\.mp4", - r"https://c10\.patreonusercontent\.com/4/patreon-media/p/post/113049301/62dc1d4194db4245aca31c56f71234ed/eyJhIjoxLCJwIjoxfQ%3D%3D/1\.mp4", - ], + "#count" : 0, }, { @@ -121,7 +117,7 @@ __tests__ = ( "#class" : patreon.PatreonPostExtractor, "#pattern" : [ r"https://c10\.patreonusercontent\.com/4/patreon-media/p/post/94714289/be3d8eb994ae44eca4baffcdc6dd25fc/eyJhIjoxLCJwIjoxfQ%3D%3D/1\.png", - r"ytdl:https://www.patreon\.com/api/video/255859412/video\.m3u8", + r"ytdl:https://stream\.mux\.com/NLrxTLdxyGStpOgapJAtB8uPGAaokEcj8YovML00y2DY\.m3u8\?token=ey", ] }, diff --git a/test/results/pornpics.py b/test/results/pornpics.py index 6caf5dd1..f2eb3df2 100644 --- a/test/results/pornpics.py +++ b/test/results/pornpics.py @@ -16,23 +16,27 @@ __tests__ = ( "categories": [ "Outdoor", - "MILF", "Boots", - "Amateur", + "MILF", + "Hairy", "Sexy", + "Pussy", + "Spreading", ], "channel" : ["FTV MILFs"], "count" : 17, "gallery_id": 62610699, - "models" : ["Danielle"], + "models" : ["Danielle Maye"], "num" : int, "slug" : "british-beauty-danielle-flashes-hot-breasts-ass-and-snatch-in-the-forest", "tags" : [ "MILF Outdoor", - "Amateur MILF", + "Forest", "Nature", - "Amateur Outdoor", - "First Time", + "Pussy Flash", + "Open Pussy", + "Hairy Pussy Spread", + "Thigh High Boots", "Sexy MILF", ], "title" : "British beauty Danielle flashes hot breasts, ass and snatch in the forest", @@ -67,7 +71,6 @@ __tests__ = ( ], "categories": [ "Outdoor", - "Asian", "Pornstar", "Brunette", "Blonde", @@ -77,8 +80,8 @@ __tests__ = ( "Fame Digital", ], "tags" : [ + "Nudist", "Nature", - "Asian Outdoor", ], }, diff --git a/test/results/redgifs.py b/test/results/redgifs.py index 610e32eb..ed7e5cac 100644 --- a/test/results/redgifs.py +++ b/test/results/redgifs.py @@ -13,7 +13,7 @@ __tests__ = ( "#category": ("", "redgifs", "user"), "#class" : redgifs.RedgifsUserExtractor, "#pattern" : r"https://\w+\.redgifs\.com/[\w-]+\.mp4", - "#count" : range(50, 60), + "#count" : range(40, 60), }, { diff --git a/test/results/rule34vault.py b/test/results/rule34vault.py index 425ef7ed..e48b4d53 100644 --- a/test/results/rule34vault.py +++ b/test/results/rule34vault.py @@ -20,7 +20,7 @@ __tests__ = ( "#url" : "https://rule34vault.com/playlists/view/20164", "#class": rule34vault.Rule34vaultPlaylistExtractor, "#pattern": r"https://r34xyz\.b-cdn\.net/posts/\d+/\d+/\d+\.(jpg|mp4)", - "#count" : 55, + "#count" : range(55, 75), }, { diff --git a/test/results/rule34xyz.py b/test/results/rule34xyz.py index 8a07c5dc..598e329b 100644 --- a/test/results/rule34xyz.py +++ b/test/results/rule34xyz.py @@ -35,12 +35,12 @@ __tests__ = ( "#urls" : "https://rule34xyz.b-cdn.net/posts/3613/3613851/3613851.pic.jpg", "#sha1_content": "4d7146db258fd5b1645a1a5fc01550d102f495e1", - "attributes": 1, + "attributes": 0, "comments" : 0, - "created" : "2023-03-29T06:00:59.136819", - "date" : "dt:2023-03-29 06:00:59", + "created" : "2023-03-29T03:00:59.136819Z", + "date" : "dt:2023-03-29 03:00:59", "duration" : None, - "error" : None, + "error" : {"", None}, "extension" : "jpg", "file_url" : "https://rule34xyz.b-cdn.net/posts/3613/3613851/3613851.pic.jpg", "filename" : "3613851.pic", @@ -48,7 +48,7 @@ __tests__ = ( "format_id" : "2", "id" : 3613851, "likes" : range(3, 100), - "posted" : "2023-03-29T06:01:07.900161", + "posted" : "2023-03-29T03:01:07.900161Z", "type" : 0, "uploaderId": 9741, "views" : range(200, 2000), @@ -102,19 +102,7 @@ __tests__ = ( "friday night funkin mod", ], "tags_general": list, - "uploader": { - "avatarUrl" : None, - "bookmarks" : 0, - "certified" : True, - "created" : "2021-04-03T08:29:51.373823", - "email" : "agent.rulexxx-uploader@z.com", - "id" : 9741, - "isSystemAccount": True, - "name" : "agent.rulexxx-uploader", - "role" : 2, - "uploadedPosts" : range(100000, 999999), - "webId" : None, - }, + "uploaderId" : 9741, }, { @@ -132,11 +120,11 @@ __tests__ = ( "#url" : "https://rule34.xyz/post/3571567", "#comment": "'format' option", "#class" : rule34xyz.Rule34xyzPostExtractor, - "#options": {"format": "10,33"}, - "#urls" : "https://rule34xyz.b-cdn.net/posts/3571/3571567/3571567.pic256avif.avif", + "#options": {"format": "10,4,5"}, + "#urls" : "https://rule34xyz.b-cdn.net/posts/3571/3571567/3571567.pic256ex.jpg", - "format" : "pic256avif", - "format_id" : "33", + "format" : "pic256ex", + "format_id" : "4", }, ) diff --git a/test/results/safebooru.py b/test/results/safebooru.py index ec92cc07..3a217166 100644 --- a/test/results/safebooru.py +++ b/test/results/safebooru.py @@ -55,7 +55,7 @@ __tests__ = ( "tags_artist" : "kawanakajima", "tags_character": "heath_ledger ronald_mcdonald the_joker", "tags_copyright": "dc_comics mcdonald's the_dark_knight", - "tags_metadata" : "parody tagme", + "tags_metadata" : "tagme", }, ) diff --git a/test/results/saint.py b/test/results/saint.py index 5cfde4d7..4985467f 100644 --- a/test/results/saint.py +++ b/test/results/saint.py @@ -12,8 +12,8 @@ __tests__ = ( "#url" : "https://saint2.su/a/2c5iuWHTumH", "#class": saint.SaintAlbumExtractor, "#urls" : ( - "https://cold1.saint2.cr/videos/3b1ccebf3576f8d5aac3ee0e5a12da95.mp4", - "https://cold1.saint2.cr/videos/3b125e3fb4b98693f17d85cb53590215.mp4", + "https://data.saint2.cr/data/3b1ccebf3576f8d5aac3ee0e5a12da95.mp4", + "https://data.saint2.cr/data/3b125e3fb4b98693f17d85cb53590215.mp4", ), "album_id" : "2c5iuWHTumH", @@ -40,13 +40,13 @@ __tests__ = ( { "#url" : "https://saint2.su/embed/6lC7mKrJst8", "#class": saint.SaintMediaExtractor, - "#urls" : "https://cold1.saint2.cr/videos/3b1ccebf3576f8d5aac3ee0e5a12da95.mp4", + "#urls" : "https://data.saint2.cr/data/3b1ccebf3576f8d5aac3ee0e5a12da95.mp4", "#sha1_content": "39037a029b3fe96f838b4545316caaa545c84075", "count" : 1, "date" : "dt:2024-10-18 15:48:16", "extension": "mp4", - "file" : "https://cold1.saint2.cr/videos/3b1ccebf3576f8d5aac3ee0e5a12da95.mp4", + "file" : str, "filename" : "3b1ccebf3576f8d5aac3ee0e5a12da95-6lC7mKrJst8", "id" : "6lC7mKrJst8", "id2" : "6712834015d67", @@ -58,11 +58,11 @@ __tests__ = ( { "#url" : "https://saint2.su/d/M2IxMjVlM2ZiNGI5ODY5M2YxN2Q4NWNiNTM1OTAyMTUubXA0", "#class": saint.SaintMediaExtractor, - "#urls" : "https://cold1.saint2.cr/api/download.php?file=M2IxMjVlM2ZiNGI5ODY5M2YxN2Q4NWNiNTM1OTAyMTUubXA0", + "#urls" : "https://data.saint2.cr/data/3b125e3fb4b98693f17d85cb53590215.mp4", "count" : 1, "extension": "mp4", - "file" : "https://cold1.saint2.cr/api/download.php?file=M2IxMjVlM2ZiNGI5ODY5M2YxN2Q4NWNiNTM1OTAyMTUubXA0", + "file" : str, "filename" : "M2IxMjVlM2ZiNGI5ODY5M2YxN2Q4NWNiNTM1OTAyMTUubXA0", "id" : "M2IxMjVlM2ZiNGI5ODY5M2YxN2Q4NWNiNTM1OTAyMTUubXA0", "id_dl" : "M2IxMjVlM2ZiNGI5ODY5M2YxN2Q4NWNiNTM1OTAyMTUubXA0", diff --git a/test/results/sexcom.py b/test/results/sexcom.py index e51f801c..9496672e 100644 --- a/test/results/sexcom.py +++ b/test/results/sexcom.py @@ -13,8 +13,8 @@ __tests__ = ( "#comment" : "picture", "#category": ("", "sexcom", "pin"), "#class" : sexcom.SexcomPinExtractor, - "#pattern" : "https://cdn.sex.com/images/.+/2014/08/26/7637609.jpg", - "#sha1_content": "ebe1814dadfebf15d11c6af4f6afb1a50d6c2a1c", + "#urls" : "https://imagex1.sx.cdn.live/images/pinporn/2014/08/26/7637609.jpg", + "#sha1_content": "8cd419c6790ef7348bd398c364ab10f956e438dc", "comments" : int, "date" : "dt:2014-10-19 15:45:44", @@ -36,7 +36,7 @@ __tests__ = ( "#comment" : "gif", "#category": ("", "sexcom", "pin"), "#class" : sexcom.SexcomPinExtractor, - "#pattern" : "https://cdn.sex.com/images/.+/2017/12/07/18760842.gif", + "#urls" : "https://imagex1.sx.cdn.live/images/pinporn/2017/12/07/18760842.gif", "#sha1_content": "176cc63fa05182cb0438c648230c0f324a5965fe", }, @@ -45,7 +45,7 @@ __tests__ = ( "#comment" : "video", "#category": ("", "sexcom", "pin"), "#class" : sexcom.SexcomPinExtractor, - "#pattern" : r"https://cdn\.sex\.com/videos/pinporn/2018/02/10/776229_hd\.mp4", + "#urls" : "https://video1.sx.cdn.live/videos/pinporn/2018/02/10/776229_hd.mp4", "#sha1_content": "e1a5834869163e2c4d1ca2677f5b7b367cf8cfff", }, diff --git a/test/results/slideshare.py b/test/results/slideshare.py index 66dd480b..5bfcf1b9 100644 --- a/test/results/slideshare.py +++ b/test/results/slideshare.py @@ -16,7 +16,7 @@ __tests__ = ( "#count" : 19, "#sha1_content": "2b6a191eab60b3978fdacfecf2da302dd45bc108", - "description" : "Get Started with SlideShare - A Beginngers Guide for Creators", + "description" : "SlideShare is a global platform for sharing presentations, infographics, videos and documents. It has over 18 million pieces of professional content uploaded by experts like Eric Schmidt and Guy Kawasaki. The document provides tips for setting up an account on SlideShare, uploading content, optimizing it for searchability, and sharing it on social media to build an audience and reputation as a subject matter expert.", "likes" : int, "presentation": "get-started-with-slide-share", "date" : "dt:2015-05-20 17:38:21", diff --git a/test/results/snootbooru.py b/test/results/snootbooru.py index 25a294eb..529fa5c9 100644 --- a/test/results/snootbooru.py +++ b/test/results/snootbooru.py @@ -13,7 +13,7 @@ __tests__ = ( "#category": ("szurubooru", "snootbooru", "tag"), "#class" : szurubooru.SzurubooruTagExtractor, "#pattern" : r"https://snootbooru\.com/data/posts/\d+_[0-9a-f]{16}\.\w+", - "#count" : range(35, 50), + "#count" : range(100, 300), }, { @@ -52,7 +52,7 @@ __tests__ = ( "relationCount": 0, "relations" : [], "safety" : "safe", - "score" : 0, + "score" : range(1, 10), "source" : None, "tagCount" : 3, "tags" : [ diff --git a/test/results/steamgriddb.py b/test/results/steamgriddb.py index 8cb39d17..f48cbcfc 100644 --- a/test/results/steamgriddb.py +++ b/test/results/steamgriddb.py @@ -77,8 +77,8 @@ __tests__ = ( "#category": ("", "steamgriddb", "grids"), "#class" : steamgriddb.SteamgriddbGridsExtractor, "#options" : {"humor": False, "epilepsy": False, "untagged": False}, - "#range" : "1-33", - "#count" : 33, + "#range" : "1-30", + "#count" : range(1, 30), }, { diff --git a/test/results/subscribestar.py b/test/results/subscribestar.py index c99f2b46..7779dd55 100644 --- a/test/results/subscribestar.py +++ b/test/results/subscribestar.py @@ -13,8 +13,8 @@ __tests__ = ( "#url" : "https://www.subscribestar.com/subscribestar", "#category": ("", "subscribestar", "user"), "#class" : subscribestar.SubscribestarUserExtractor, - "#pattern" : r"https://(ss-uploads-prod\.b-cdn|\w+\.cloudfront)\.net/uploads(_v2)?/users/11/", - "#count" : ">= 20", + "#pattern" : r"https://(www\.subscribestar\.com/uploads\?payload=.+|(ss-uploads-prod\.b-cdn|\w+\.cloudfront)\.net/uploads(_v2)?/users/11/)", + "#count" : range(15, 25), "author_id" : 11, "author_name": "subscribestar", @@ -58,8 +58,8 @@ __tests__ = ( "author_nick": "SubscribeStar", "content" : r"re:

Brand Guidelines and Assets

", "date" : "dt:2020-05-07 12:33:00", - "extension" : "jpg", - "filename" : "8ff61299-b249-47dc-880a-cdacc9081c62", + "extension" : "", + "filename" : "uploads", "group" : "imgs_and_videos", "height" : 291, "id" : 203885, diff --git a/test/results/tapas.py b/test/results/tapas.py index 1f677685..cc66ac7a 100644 --- a/test/results/tapas.py +++ b/test/results/tapas.py @@ -83,7 +83,7 @@ __tests__ = ( "book" : False, "closing" : None, "closing_date" : None, - "comment_cnt" : 335, + "comment_cnt" : range(330, 500), "date" : "dt:2023-01-13 19:00:00", "early_access" : False, "escape_title" : "Episode 3", diff --git a/test/results/tcbscans.py b/test/results/tcbscans.py index b3d0cb54..c6e16861 100644 --- a/test/results/tcbscans.py +++ b/test/results/tcbscans.py @@ -10,7 +10,7 @@ from gallery_dl import exception __tests__ = ( { - "#url" : "https://tcbscans.com/chapters/4708/chainsaw-man-chapter-108", + "#url" : "https://tcbscans.me/chapters/4708/chainsaw-man-chapter-108", "#category": ("", "tcbscans", "chapter"), "#class" : tcbscans.TcbscansChapterExtractor, "#pattern" : r"https://cdn\.[^/]+/(file|attachments/[^/]+)/[^/]+/[^.]+\.\w+", @@ -46,7 +46,7 @@ __tests__ = ( }, { - "#url" : "https://tcb-backup.bihar-mirchi.com/chapters/7719/jujutsu-kaisen-chapter-258", + "#url" : "https://tcbscans.me/chapters/7719/jujutsu-kaisen-chapter-258", "#category": ("", "tcbscans", "chapter"), "#class" : tcbscans.TcbscansChapterExtractor, "#pattern" : r"https://cdn\.[^/]+/(file|attachments/[^/]+)/[^/]+/[^.]+\.\w+", @@ -60,7 +60,7 @@ __tests__ = ( }, { - "#url" : "https://tcbscans.com/mangas/13/chainsaw-man", + "#url" : "https://tcbscans.me/mangas/13/chainsaw-man", "#category": ("", "tcbscans", "manga"), "#class" : tcbscans.TcbscansMangaExtractor, "#pattern" : tcbscans.TcbscansChapterExtractor.pattern, @@ -86,9 +86,13 @@ __tests__ = ( }, { - "#url" : "https://tcbscans.me/mangas/4/jujutsu-kaisen", - "#category": ("", "tcbscans", "manga"), + "#url" : "https://tcbscans.com/mangas/4/jujutsu-kaisen", "#class" : tcbscans.TcbscansMangaExtractor, }, +{ + "#url" : "https://tcb-backup.bihar-mirchi.com/chapters/7719/jujutsu-kaisen-chapter-258", + "#class" : tcbscans.TcbscansChapterExtractor, +}, + ) diff --git a/test/results/twibooru.py b/test/results/twibooru.py index 4720309f..a39f9de7 100644 --- a/test/results/twibooru.py +++ b/test/results/twibooru.py @@ -21,7 +21,7 @@ __tests__ = ( "created_at" : "2020-07-08T22:26:55.743Z", "date" : "dt:2020-07-08 22:26:55", "description" : "Why have I done this?", - "downvotes" : 0, + "downvotes" : range(1, 10), "duration" : 0.0, "faves" : int, "first_seen_at" : "2020-07-08T22:26:55.743Z", @@ -30,7 +30,6 @@ __tests__ = ( "hidden_from_users": False, "id" : 1, "intensities" : dict, - "locations" : [], "media_type" : "image", "mime_type" : "image/png", "name" : "1676547__safe_artist-colon-scraggleman_oc_oc-colon-floor+bored_oc+only_bags+under+eyes_bust_earth+pony_female_goggles_helmet_mare_meme_neet_neet+home+g.png", @@ -40,7 +39,7 @@ __tests__ = ( "score" : int, "sha512_hash" : "8b4c00d2eff52d51ad9647e14738944ab306fd1d8e1bf634fbb181b32f44070aa588938e26c4eb072b1eb61489aaf3062fb644a76c79f936b97723a2c3e0e5d3", "size" : 70910, - "source_url" : "", + "source_url" : str, "tag_ids" : list, "tags" : list, "thumbnails_generated": True, @@ -49,6 +48,14 @@ __tests__ = ( "view_url" : "https://cdn.twibooru.org/img/2020/7/8/1/full.png", "width" : 576, "wilson_score" : float, + "locations": [ + { + "id_at_location": 1676547, + "location": "derpibooru", + "url_at_location": "https://derpibooru.org/images/1676547", + }, + ], + }, { diff --git a/test/results/unsplash.py b/test/results/unsplash.py index 8c529743..95118589 100644 --- a/test/results/unsplash.py +++ b/test/results/unsplash.py @@ -58,7 +58,6 @@ __tests__ = ( "sponsorship": None, "subcategory": "image", "tags" : list, - "tags_preview": list, "topic_submissions": {}, "topics" : [], "updated_at" : str, diff --git a/test/results/vk.py b/test/results/vk.py index b681bdf9..9c5f530e 100644 --- a/test/results/vk.py +++ b/test/results/vk.py @@ -13,7 +13,7 @@ __tests__ = ( "#url" : "https://vk.com/id398982326", "#category": ("", "vk", "photos"), "#class" : vk.VkPhotosExtractor, - "#pattern" : r"https://sun\d+-\d+\.userapi\.com/s/v1/if1/[\w-]+\.jpg\?size=\d+x\d+&quality=96&type=album", + "#pattern" : r"https://sun\d+-\d+\.userapi\.com/c\d+/v\d+/\w+/[\w-]+\.\w+", "#count" : ">= 35", "id" : r"re:\d+", diff --git a/test/results/warosu.py b/test/results/warosu.py index fd095183..0011e560 100644 --- a/test/results/warosu.py +++ b/test/results/warosu.py @@ -46,7 +46,7 @@ __tests__ = ( "image" : "https://i.warosu.org/data/jp/img/0166/58/1488521824388.jpg", "name" : "Anonymous", "no" : 16658073, - "now" : "Fri Mar 3 01:17:04 2017", + "now" : "Fri, Mar 3, 2017 01:17:04", "thread" : "16658073", "tim" : 1488521824388, "time" : 1488503824, @@ -83,7 +83,7 @@ __tests__ = ( "image" : r"re:https://i.warosu\.org/data/ic/img/0046/04/1590\d+\.jpg", "name" : "re:Anonymous|Dhe Specky Spider-Man", "no" : range(4604652, 4620000), - "now" : r"re:\w\w\w \w\w\w \d\d \d\d:\d\d:\d\d 2020", + "now" : r"re:\w\w\w, \w\w\w \d\d?, 2020 \d\d:\d\d:\d\d", "thread" : "4604652", "tim" : range(1590430159651, 1590755510488), "time" : range(1590415759, 1590755510), diff --git a/test/results/yiffverse.py b/test/results/yiffverse.py index 59df47cd..a2654953 100644 --- a/test/results/yiffverse.py +++ b/test/results/yiffverse.py @@ -13,13 +13,13 @@ __tests__ = ( "#comment": "image", "#class" : yiffverse.YiffversePostExtractor, "#options" : {"tags": True}, - "#urls" : "https://yiffverse.com/posts/574/574342/574342.pic.jpg", + "#pattern" : r"https://(yiffverse\.com|furry34com\.b-cdn\.net)/posts/574/574342/574342\.pic\.jpg", "#sha1_content": "0f169fddbd320eae904508f83a722bb3633ad507", "created" : "2024-12-06T13:55:24.483002Z", "date" : "dt:2024-12-06 13:55:24", "extension": "jpg", - "file_url" : "https://yiffverse.com/posts/574/574342/574342.pic.jpg", + "file_url" : str, "filename" : "574342", "format" : "pic", "format_id": "10", @@ -72,7 +72,7 @@ __tests__ = ( "#url" : "https://yiffverse.com/playlist/6842", "#class": yiffverse.YiffversePlaylistExtractor, "#pattern": r"https://(yiffverse\.com|furry34com\.b-cdn\.net)/posts/\d+/\d+/\d+\.mov(720)?\.mp4", - "#count" : 25, + "#count" : range(30, 50), }, ) diff --git a/test/results/zerochan.py b/test/results/zerochan.py index a393e20e..a5770c0b 100644 --- a/test/results/zerochan.py +++ b/test/results/zerochan.py @@ -130,7 +130,7 @@ __tests__ = ( "height" : 1125, "id" : 4233756, "path" : [ - "Toriyama Akira", + "Manga", "DRAGON BALL", ], "size" : 136192, diff --git a/test/results/zzup.py b/test/results/zzup.py index 322a9601..73731b1a 100644 --- a/test/results/zzup.py +++ b/test/results/zzup.py @@ -12,7 +12,7 @@ __tests__ = ( "#url" : "https://zzup.com/content/NjM=/MetArt_20080206_viki_c_sensazioni_by_ingret/OTE=/index.html", "#category": ("", "zzup", "gallery"), "#class" : zzup.ZzupGalleryExtractor, - "#pattern" : r"https://zzup\.com/MjAxNjc3OTIyMjE5Nzk=/showimage/zzup-8769086487/image00\d\d\d-5896498214-1-9689595623/MetArt-20080206_viki_c_sensazioni_by_ingret/9879560327/zzup.com.jpg", + "#pattern" : r"https://zzup\.com/[^/?#]+/showimage/zzup-8769086487/image00\d\d\d-5896498214-1-9689595623/MetArt-20080206_viki_c_sensazioni_by_ingret/9879560327/zzup.com.jpg", "slug" : "MetArt_20080206_viki_c_sensazioni_by_ingret", "title" : "MetArt 20080206 viki c sensazioni by ingret", @@ -24,7 +24,7 @@ __tests__ = ( "#url" : "https://zzup.com/content/MTc2MDYxMw==/Courtesan/NDA=/page-1.html", "#category": ("", "zzup", "gallery"), "#class" : zzup.ZzupGalleryExtractor, - "#pattern" : r"https://zzup.com/MjAxNjc3OTIyMjE5Nzk=/showimage/zzup-8769086487/image000\d\d-5896498214-40-9689595623/Courtesan/9879560327/zzup.com.jpg", + "#pattern" : r"https://zzup\.com/[^/?#]+/showimage/zzup-8769086487/image000\d\d-5896498214-40-9689595623/Courtesan/9879560327/zzup.com.jpg", }, {