From c9efccc959249abeb91a7e2d75cec30e92c8fccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Fri, 16 Feb 2024 22:42:06 +0100 Subject: [PATCH] [tests] update extractor results --- test/results/2ch.py | 2 +- test/results/2chan.py | 2 +- test/results/exhentai.py | 2 +- test/results/hentaifoundry.py | 47 ++++++++---------- test/results/jpgfish.py | 6 +-- test/results/komikcast.py | 2 +- test/results/misskeyio.py | 4 +- test/results/pinterest.py | 2 +- test/results/rule34.py | 2 +- test/results/slideshare.py | 3 +- test/results/smugmug.py | 92 ++++++++++++++++++++++++++++++++--- test/results/unsplash.py | 10 ++-- test/results/webtoons.py | 2 +- test/results/xbooru.py | 9 +++- 14 files changed, 131 insertions(+), 54 deletions(-) diff --git a/test/results/2ch.py b/test/results/2ch.py index a15af39c..ad35adaa 100644 --- a/test/results/2ch.py +++ b/test/results/2ch.py @@ -58,7 +58,7 @@ __tests__ = ( "#category": ("", "2ch", "board"), "#class" : _2ch._2chBoardExtractor, "#pattern" : _2ch._2chThreadExtractor.pattern, - "#count" : range(200, 300), + "#count" : range(200, 400), }, ) diff --git a/test/results/2chan.py b/test/results/2chan.py index 78f48e58..08ed2ede 100644 --- a/test/results/2chan.py +++ b/test/results/2chan.py @@ -22,7 +22,7 @@ __tests__ = ( "fsize" : r"re:\d+", "name" : "名無し", "no" : r"re:17\d\d\d", - "now" : r"re:23/../..\(.\)..:..:..", + "now" : r"re:2[34]/../..\(.\)..:..:..", "post" : "無題", "server" : "dec", "thread" : "17222", diff --git a/test/results/exhentai.py b/test/results/exhentai.py index f7967f1a..731066aa 100644 --- a/test/results/exhentai.py +++ b/test/results/exhentai.py @@ -121,7 +121,7 @@ __tests__ = ( "#category": ("", "exhentai", "favorite"), "#class" : exhentai.ExhentaiFavoriteExtractor, "#auth" : True, - "#urls" : "https://e-hentai.org/g/1200119/d55c44d3d0", + "#urls" : "https://e-hentai.org/g/1200119/d55c44d3d0/", }, { diff --git a/test/results/hentaifoundry.py b/test/results/hentaifoundry.py index da2aa30c..35c66f8a 100644 --- a/test/results/hentaifoundry.py +++ b/test/results/hentaifoundry.py @@ -101,41 +101,34 @@ __tests__ = ( }, { - "#url" : "https://www.hentai-foundry.com/pictures/user/suuxe/161533/ANIMATION-of-Insane-Black-Rock-Shooter-FAN-ART", + "#url" : "https://www.hentai-foundry.com/pictures/user/Soloid/186714/Osaloop", "#comment" : "SWF / rumble embed (#4641)", "#category": ("", "hentaifoundry", "image"), "#class" : hentaifoundry.HentaifoundryImageExtractor, - "#urls" : "https://pictures.hentai-foundry.com/s/suuxe/161533/suuxe-161533-ANIMATION_of_Insane_Black_Rock_Shooter_FAN_ART.swf", + "#urls" : "https://pictures.hentai-foundry.com/s/Soloid/186714/Soloid-186714-Osaloop.swf", - "artist" : "suuxe", - "date" : "dt:2012-09-15 09:50:45", - "description": "Here is one of my fav drawings I have made NOW with ANIMATIONS! \"yay\" \n\nTook me ages to get this animation to right size because when I was rendering it out from after effects it crop the freaking drawing so it would be \"widescreen\" for some reason after effects wants that but I was able to \"fix it\" by making it believe the whole drawing was widescreen while the drawing was in the corner then I crop it in flash to get the right size I am soooo smart mohahahaha.....!\n\nYou can also find it on my deviantart site:\nhttp://suuxe.deviantart.com/art/ANIMATION-of-Insane-Black-Rock-Shooter-FAN-ART-327072898\n\nUPDATE:\n-Her left arm moves\n-\"Eye flame\" glow is stronger\n-Fire sparkle on the eye flame\n-Rain animations are more visible now\n-Front mist animation also moves around\n-Sparkle animation down left is more visible now\n-Changed the color on the flying dust so it looks more like flame/glow\n\nOld animations made in After Effects:\n-Fire sparkle thingy down left \n-Two layers of rain \n-Glow on her left eye \n-Four layers of mist \n-Some dust particles or what ever you want to call it \n\nStep by Step video: http://www.youtube.com/watch?v=m_-4PLmOCNg", + "artist" : "Soloid", + "date" : "dt:2013-02-07 17:25:54", + "description": "It took me ages.\nI hope you'll like it.\nSorry for the bad quality, I made it on after effect because Flash works like shit when you have 44 layers to animate, and the final ae SWF file is 55mo big.", "extension" : "swf", - "filename" : "suuxe-161533-ANIMATION_of_Insane_Black_Rock_Shooter_FAN_ART", - "height" : 900, - "index" : 161533, + "filename" : "Soloid-186714-Osaloop", + "height" : 768, + "index" : 186714, "media" : "Digital drawing or painting", - "ratings" : ["Teen content"], - "score" : range(10, 30), - "src" : "https://pictures.hentai-foundry.com/s/suuxe/161533/suuxe-161533-ANIMATION_of_Insane_Black_Rock_Shooter_FAN_ART.swf", + "ratings" : [ + "Nudity", + "Sexual content", + "Contains female nudity", + ], + "score" : range(80, 120), + "src" : "https://pictures.hentai-foundry.com/s/Soloid/186714/Soloid-186714-Osaloop.swf", "tags" : [ - "animation", - "art", - "black", - "brs", - "epic", - "fan", - "flash", - "hot", - "insane", - "kid", - "rock", - "shooter" + "soloid", ], - "title" : "ANIMATION of Insane Black Rock Shooter FAN ART", - "user" : "suuxe", - "views" : range(30000, 40000), - "width" : 393, + "title" : "Osaloop", + "user" : "Soloid", + "views" : range(45000, 60000), + "width" : 613, }, { diff --git a/test/results/jpgfish.py b/test/results/jpgfish.py index 354e2ff5..bef1d6e0 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.jpg.church/images/funnymeme.jpg", + "#urls" : "https://simp3.host.church/images/funnymeme.jpg", "#sha1_content": "098e5e9b17ad634358426e0ffd1c93871474d13c", "album" : "", "extension": "jpg", "filename" : "funnymeme", "id" : "LecXGS", - "url" : "https://simp3.jpg.church/images/funnymeme.jpg", + "url" : "https://simp3.host.church/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\.jpg\.church/hannahowo_00457\.jpg", + "#pattern" : r"https://simp2\.host\.church/hannahowo_00457\.jpg", "album": "401-500", }, diff --git a/test/results/komikcast.py b/test/results/komikcast.py index bfbd3e47..0bd76121 100644 --- a/test/results/komikcast.py +++ b/test/results/komikcast.py @@ -49,7 +49,7 @@ __tests__ = ( "#url" : "https://komikcast.me/chapter/soul-land-ii-chapter-300-1-bahasa-indonesia/", "#category": ("", "komikcast", "chapter"), "#class" : komikcast.KomikcastChapterExtractor, - "#pattern" : r"https://svr\d\.imgkc\.my\.id/wp-content/img/S/Soul_Land_II/300\.1/\d\d\.jpg", + "#pattern" : r"https://svr\d\.imgkc\d*\.my\.id/wp-content/img/S/Soul_Land_II/300\.1/\d\d\.jpg", "#count" : 9, "#sha1_metadata": "cb646cfed3d45105bd645ab38b2e9f7d8c436436", }, diff --git a/test/results/misskeyio.py b/test/results/misskeyio.py index 9d005483..4de64aa4 100644 --- a/test/results/misskeyio.py +++ b/test/results/misskeyio.py @@ -12,7 +12,7 @@ __tests__ = ( "#url" : "https://misskey.io/@lithla", "#category": ("misskey", "misskey.io", "user"), "#class" : misskey.MisskeyUserExtractor, - "#pattern" : r"https://(media.misskeyusercontent.com/io|s\d+\.arkjp\.net/misskey)/[\w-]+\.\w+", + "#pattern" : r"https://(media.misskeyusercontent.com|s\d+\.arkjp\.net)/(misskey|io)/[\w-]+\.\w+", "#range" : "1-50", "#count" : 50, }, @@ -37,7 +37,7 @@ __tests__ = ( "#url" : "https://misskey.io/notes/9bhqfo835v", "#category": ("misskey", "misskey.io", "note"), "#class" : misskey.MisskeyNoteExtractor, - "#pattern" : r"https://s\d+\.arkjp\.net/misskey/[\w-]+\.\w+", + "#pattern" : r"https://(media\.misskeyusercontent\.com|s\d+\.arkjp\.net)/misskey/[\w-]+\.\w+", "#count" : 4, }, diff --git a/test/results/pinterest.py b/test/results/pinterest.py index 73bebfa4..08234c01 100644 --- a/test/results/pinterest.py +++ b/test/results/pinterest.py @@ -110,7 +110,7 @@ __tests__ = ( "#url" : "https://www.pinterest.de/digitalmomblog/_created/", "#category": ("", "pinterest", "created"), "#class" : pinterest.PinterestCreatedExtractor, - "#pattern" : r"https://i\.pinimg\.com/originals/[0-9a-f]{2}/[0-9a-f]{2}/[0-9a-f]{2}/[0-9a-f]{32}\.(jpg|png)", + "#pattern" : r"ytdl:|https://i\.pinimg\.com/originals/[0-9a-f]{2}/[0-9a-f]{2}/[0-9a-f]{2}/[0-9a-f]{32}\.(jpg|png)", "#range" : "1-10", "#count" : 10, }, diff --git a/test/results/rule34.py b/test/results/rule34.py index f8fefa32..604e7dbe 100644 --- a/test/results/rule34.py +++ b/test/results/rule34.py @@ -57,7 +57,7 @@ __tests__ = ( "tags_artist" : "reverse_noise yamu_(reverse_noise)", "tags_character": "hong_meiling", - "tags_copyright": "touhou", + "tags_copyright": "team_shanghai_alice touhou", "tags_general" : str, "tags_metadata" : "censored translated", "notes" : [ diff --git a/test/results/slideshare.py b/test/results/slideshare.py index 561f0676..9066f3a7 100644 --- a/test/results/slideshare.py +++ b/test/results/slideshare.py @@ -41,7 +41,8 @@ __tests__ = ( "#comment" : "mobile URL", "#category": ("", "slideshare", "presentation"), "#class" : slideshare.SlidesharePresentationExtractor, - "#sha1_url": "72c431cb1eccbb6794f608ecbbc01d52e8768159", + "#pattern" : r"https://image\.slidesharecdn\.com/introductiontofixedprosthodonticsfinal-110427200948-phpapp02/95/introduction-to-fixed-prosthodontics-\d+-1024\.jpg\?cb=\d+", + "#count" : 27, }, ) diff --git a/test/results/smugmug.py b/test/results/smugmug.py index fd30a6b9..dda8d3a2 100644 --- a/test/results/smugmug.py +++ b/test/results/smugmug.py @@ -12,7 +12,14 @@ __tests__ = ( "#url" : "smugmug:album:cr4C7f", "#category": ("", "smugmug", "album"), "#class" : smugmug.SmugmugAlbumExtractor, - "#sha1_url": "2c2e576e47d4e9ce60b44871f08a8c66b5ebaceb", + "#urls": ( + "https://photos.smugmug.com/Nature/Dove/i-XvZFJFG/0/DMk7cm6qRBSFPvQgT9C4t4jtBJKF7JSK9jszgHZnr/O/Dual%20Suicide_20070721-DSC_4804.jpg", + "https://photos.smugmug.com/Nature/Dove/i-2wVPqHf/0/DBXmTSTqVWzTLZxL3JPVK7hGT9zp8tzsFdhtWm68v/O/Morning%20Dove2_20070621-DSC_3222.jpg", + "https://photos.smugmug.com/Nature/Dove/i-QHFnmb8/0/GKLvnm7zFQWX2G2VcJRprx8WZqTfFJkn8C5nRnCk/O/Speed%20Skater_03082008_POR7728.jpg", + "https://photos.smugmug.com/Nature/Dove/i-MXQZKws/0/D6XCS9xnncDVtZ9NtVq66ZK9xjL4D2H9KSbpFMjfM/O/Airing%20it%20Out0_5142008_DSC_8166.jpg", + "https://photos.smugmug.com/Nature/Dove/i-kCsLJT6/0/FfB6gSx8X6MS7Hvww7GK7tWsrfdtwCx79hCVzwSm/O/Fluff_20090521-_DSC1542.jpg", + "https://photos.smugmug.com/Nature/Dove/i-T9Qv5Pm/0/CFT4MB9hg7rKwWmbFhGQTCnmxdpnGBKPDbHTPLSgV/O/D2F_D300_20090827-_TDM5650.jpg", + ), }, { @@ -28,16 +35,88 @@ __tests__ = ( "#comment" : "no 'User'", "#category": ("", "smugmug", "album"), "#class" : smugmug.SmugmugAlbumExtractor, - "#sha1_url": "c4a0f4c4bfd514b93cbdeb02b3345bf7ef6604df", + "#sha1_url": "17837ff2c78a6e2335291666f43d620d82f2926a", + + "User": { + "Name" : "", + "NickName" : "", + "QuickShare" : False, + "RefTag" : "", + "ResponseLevel": "Public", + "Uri" : "", + "ViewPassHint" : "", + "WebUri" : "", + }, }, { "#url" : "https://tdm.smugmug.com/Nature/Dove/i-kCsLJT6", "#category": ("", "smugmug", "image"), "#class" : smugmug.SmugmugImageExtractor, - "#sha1_url" : "e6408fd2c64e721fd146130dceb56a971ceb4259", - "#sha1_metadata": "b31a63d07c9c26eb0f79f52d60d171a98938f99b", - "#sha1_content" : "ecbd9d7b4f75a637abc8d35319be9ec065a44eb0", + "#urls" : "https://photos.smugmug.com/Nature/Dove/i-kCsLJT6/0/FfB6gSx8X6MS7Hvww7GK7tWsrfdtwCx79hCVzwSm/O/Fluff_20090521-_DSC1542.jpg", + "#sha1_content": "ecbd9d7b4f75a637abc8d35319be9ec065a44eb0", + + "Image": { + "Altitude" : 0, + "CanBuy" : True, + "CanEdit" : False, + "CanShare" : True, + "Caption" : "White Wing Dove", + "Collectable": False, + "Comments" : True, + "ComponentFileTypes": [], + "Date" : "2009-08-01T23:00:56+00:00", + "DateTimeOriginal": "2009-05-22T00:05:36+00:00", + "DateTimeUploaded": "2009-08-01T23:00:56+00:00", + "EZProject" : False, + "FileName" : "Fluff_20090521-_DSC1542.jpg", + "Format" : "JPG", + "FormattedValues": { + "Caption": { + "html": "White Wing Dove", + "text": "White Wing Dove", + }, + "FileName": { + "html": "Fluff_20090521-_DSC1542.jpg", + "text": "Fluff_20090521-_DSC1542.jpg", + }, + }, + "Height" : 1008, + "Hidden" : False, + "ImageKey" : "kCsLJT6", + "IsArchive" : False, + "IsVideo" : False, + "KeywordArray": [ + "Birds", + "Dove", + "White Wing Dove", + ], + "Keywords" : "Birds; Dove; White Wing Dove", + "LastUpdated": "2012-11-03T20:01:15+00:00", + "Latitude" : "0", + "Longitude" : "0", + "OriginalHeight": 1008, + "OriginalSize": 381297, + "OriginalWidth": 1024, + "PreferredDisplayFileExtension": "JPG", + "Processing" : False, + "Protected" : True, + "Serial" : 0, + "ShowKeywords": True, + "Size" : 381297, + "Status" : "Open", + "SubStatus" : "NFS", + "ThumbnailUrl": "https://photos.smugmug.com/Nature/Dove/i-kCsLJT6/0/Df2nQXwHWSmmh4W2CjhJJdxDcZWbhkKTG86JXp9x2/Th/Fluff_20090521-_DSC1542-Th.jpg", + "Title" : "", + "UploadKey" : "608043804", + "Uri" : "/api/v2/image/kCsLJT6-0", + "Url" : "https://photos.smugmug.com/Nature/Dove/i-kCsLJT6/0/FfB6gSx8X6MS7Hvww7GK7tWsrfdtwCx79hCVzwSm/O/Fluff_20090521-_DSC1542.jpg", + "Watermark" : "No", + "Watermarked": False, + "Width" : 1024, + }, + "extension": "jpg", + "filename": "Fluff_20090521-_DSC1542", }, { @@ -45,8 +124,7 @@ __tests__ = ( "#comment" : "video", "#category": ("", "smugmug", "image"), "#class" : smugmug.SmugmugImageExtractor, - "#sha1_url" : "04d0ab1ff829ca7d78f5acb5548953df08e9a5ee", - "#sha1_metadata": "2b545184592c282b365fcbb7df6ca7952b8a3173", + "#urls" : "https://photos.smugmug.com/Dailies/Daily-Dose-2015/i-39JFNzB/0/Q4Qg6kt4SqVcKsSLWM4PnhMhSTS2r5BkmBMd9Dx4/1920/657%20WS3-1920.mp4", }, { diff --git a/test/results/unsplash.py b/test/results/unsplash.py index 29f793c7..0050bdce 100644 --- a/test/results/unsplash.py +++ b/test/results/unsplash.py @@ -62,10 +62,10 @@ __tests__ = ( "hakone", "神奈川県 日本", "torii", - "hakone shrine", - "sunrise", - "traditional", "shrine", + "traditional", + "sunrise", + "hakone shrine", "wallpaper", "grey", "arbour", @@ -76,7 +76,7 @@ __tests__ = ( "tags_preview": list, "topic_submissions": {}, "topics" : [], - "updated_at" : "2024-01-19T08:21:54Z", + "updated_at" : str, "urls": dict, "user": { "accepted_tos" : True, @@ -135,7 +135,7 @@ __tests__ = ( "#category": ("", "unsplash", "favorite"), "#class" : unsplash.UnsplashFavoriteExtractor, "#pattern" : r"https://images\.unsplash\.com/(photo-\d+-\w+|reserve/[^/?#]+)\?ixid=\w+&ixlib=rb-4\.0\.3$", - "#count" : 31, + "#count" : range(25, 35), }, { diff --git a/test/results/webtoons.py b/test/results/webtoons.py index 3e6beec3..36958716 100644 --- a/test/results/webtoons.py +++ b/test/results/webtoons.py @@ -83,7 +83,7 @@ __tests__ = ( "#url" : "https://www.webtoons.com/en/canvas/us-over-here/1-the-wheel/viewer?title_no=919536&episode_no=1", "#category": ("", "webtoons", "episode"), "#class" : webtoons.WebtoonsEpisodeExtractor, - "#count" : 59, + "#count" : 60, "comic_name" : "Us, over here", "episode_name": "1. The Wheel", diff --git a/test/results/xbooru.py b/test/results/xbooru.py index 978d3227..016958c9 100644 --- a/test/results/xbooru.py +++ b/test/results/xbooru.py @@ -19,8 +19,13 @@ __tests__ = ( "#url" : "https://xbooru.com/index.php?page=pool&s=show&id=757", "#category": ("gelbooru_v02", "xbooru", "pool"), "#class" : gelbooru_v02.GelbooruV02PoolExtractor, - "#count" : 5, - "#sha1_url": "ceeac56c179ec72301bd0b6add6355a138fdea01", + "#urls": ( + "https://img.xbooru.com/images/154/aeca160f8c7131f6a93033adac5416d7.jpeg", + "https://img.xbooru.com/images/278/6185a8a71547568020e45e8319c02978.jpeg", + "https://img.xbooru.com/images/524/0fc2b1e2e3cc8be259e9712ca3f48b0b.jpeg", + "https://img.xbooru.com/images/253/74412b59a60fac5040c6cfe8efe7a625.jpeg", + "https://img.xbooru.com/images/590/2eacd900958a467fb053b8a92145b55b.jpeg", + ), }, {