From 009aa90c3f9b04f4a808525fa2749589e980b7c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sat, 1 Jun 2024 20:28:04 +0200 Subject: [PATCH] [tests] update extractor results at least some of them --- test/results/4archive.py | 4 ++-- test/results/8chan.py | 4 ++-- test/results/batoto.py | 4 ++-- test/results/bbc.py | 2 +- test/results/bluesky.py | 1 + test/results/bulbapedia.py | 4 ++-- test/results/pixiv.py | 2 +- test/results/realbooru.py | 15 ++++++++++----- test/results/slideshare.py | 6 +++--- test/results/smugloli.py | 6 +++--- test/results/twitter.py | 6 +++--- 11 files changed, 30 insertions(+), 24 deletions(-) diff --git a/test/results/4archive.py b/test/results/4archive.py index ec90b929..cebec6fc 100644 --- a/test/results/4archive.py +++ b/test/results/4archive.py @@ -14,7 +14,7 @@ __tests__ = ( "#url" : "https://4archive.org/board/u/thread/2397221", "#category": ("", "4archive", "thread"), "#class" : _4archive._4archiveThreadExtractor, - "#pattern" : r"https://i\.imgur\.com/\w{7}\.\w+$", + "#pattern" : r"https://(cdn\.4archive\.org/u/image/150\d/\d\d\d/\d+\.\w+|4archive\.org/image/image-404\.png)", "#count" : 16, "board" : "u", @@ -35,7 +35,7 @@ __tests__ = ( "#url" : "https://4archive.org/board/jp/thread/17611798", "#category": ("", "4archive", "thread"), "#class" : _4archive._4archiveThreadExtractor, - "#pattern" : r"https://i\.imgur\.com/\w{7}\.\w+$", + "#pattern" : r"https://(cdn\.4archive\.org/jp/image/\d\d\d\d/\d\d\d/\d+\.\w+|4archive\.org/image/image-404\.png)", "#count" : 85, }, diff --git a/test/results/8chan.py b/test/results/8chan.py index 7bdbdecc..df281680 100644 --- a/test/results/8chan.py +++ b/test/results/8chan.py @@ -46,8 +46,8 @@ __tests__ = ( "uniquePosters" : 9, "usesCustomCss" : True, "usesCustomJs" : False, - "?wsPort" : 8880, - "?wssPort" : 2087, + "?wsPort" : int, + "?wssPort" : int, }, { diff --git a/test/results/batoto.py b/test/results/batoto.py index 0334f2cc..0da716be 100644 --- a/test/results/batoto.py +++ b/test/results/batoto.py @@ -81,7 +81,7 @@ __tests__ = ( "chapter" : int, "chapter_minor": str, "date" : "type:datetime", - "manga" : "Futsutsuka na Akujo de wa Gozaimasu ga - Suuguu Chouso Torikae Den (Official)", + "manga" : "Futsutsuka na Akujo de wa Gozaimasu ga - Suuguu Chouso Torikae Den", "manga_id" : 113742, }, @@ -102,7 +102,7 @@ __tests__ = ( "#class" : batoto.BatotoMangaExtractor, "#count" : ">= 29", - "manga": "The Grand Duke’s Fox Princess〖MGCHAN〗", + "manga": "Grand Duke Dan Putri Rubah [cont by LUNABY]", }, { diff --git a/test/results/bbc.py b/test/results/bbc.py index e458a06a..836786ae 100644 --- a/test/results/bbc.py +++ b/test/results/bbc.py @@ -18,7 +18,7 @@ __tests__ = ( "programme": "p084qtzs", "path" : [ "BBC One", - "Doctor Who", + "Doctor Who (2005–2022)", "The Timeless Children", ], }, diff --git a/test/results/bluesky.py b/test/results/bluesky.py index 1bba4638..68815614 100644 --- a/test/results/bluesky.py +++ b/test/results/bluesky.py @@ -76,6 +76,7 @@ __tests__ = ( "#class" : bluesky.BlueskyFeedExtractor, "#range" : "1-40", "#count" : 40, + "#archive" : False, }, { diff --git a/test/results/bulbapedia.py b/test/results/bulbapedia.py index 0cd7756b..1549a035 100644 --- a/test/results/bulbapedia.py +++ b/test/results/bulbapedia.py @@ -12,7 +12,7 @@ __tests__ = ( "#url" : "https://bulbapedia.bulbagarden.net/wiki/Jet", "#category": ("wikimedia", "bulbapedia", "article"), "#class" : wikimedia.WikimediaArticleExtractor, - "#pattern" : r"http://archives\.bulbagarden\.net/media/upload/\w+/\w+/[^/?#]+", + "#pattern" : r"https://archives\.bulbagarden\.net/media/upload/\w+/\w+/[^/?#]+", "#count" : range(10, 30), }, @@ -20,7 +20,7 @@ __tests__ = ( "#url" : "https://archives.bulbagarden.net/wiki/File:0460Abomasnow-Mega.png", "#category": ("wikimedia", "bulbapedia", "file"), "#class" : wikimedia.WikimediaArticleExtractor, - "#pattern" : r"http://archives\.bulbagarden\.net/media/upload/\w+/\w+/[^/?#]+", + "#pattern" : r"https://archives\.bulbagarden\.net/media/upload/\w+/\w+/[^/?#]+", "#count" : range(8, 12), "#archive" : False, }, diff --git a/test/results/pixiv.py b/test/results/pixiv.py index 0674369b..6711cebc 100644 --- a/test/results/pixiv.py +++ b/test/results/pixiv.py @@ -164,7 +164,7 @@ __tests__ = ( }, { - "#url" : "https://www.pixiv.net/artworks/966412", + "#url" : "https://www.pixiv.net/artworks/85960783", "#comment" : "limit_sanity_level_360.png (#4327, #5180)", "#category": ("", "pixiv", "work"), "#class" : pixiv.PixivWorkExtractor, diff --git a/test/results/realbooru.py b/test/results/realbooru.py index 5eb26399..55e5dc37 100644 --- a/test/results/realbooru.py +++ b/test/results/realbooru.py @@ -19,14 +19,20 @@ __tests__ = ( "#url" : "https://realbooru.com/index.php?page=pool&s=show&id=1", "#category": ("gelbooru_v02", "realbooru", "pool"), "#class" : gelbooru_v02.GelbooruV02PoolExtractor, - "#count" : 3, + "#urls" : ( + "https://realbooru.com//images/bf/d6/bfd682f338691e5254de796040fcba21.webm", + "https://realbooru.com//images/cb/7d/cb7d921673ba99f688031ac554777695.webm", + "https://realbooru.com//images/9e/14/9e140edc1cb2e4cc734ba5bdc4870955.webm", + ), }, { "#url" : "https://realbooru.com/index.php?page=favorites&s=view&id=274", "#category": ("gelbooru_v02", "realbooru", "favorite"), "#class" : gelbooru_v02.GelbooruV02FavoriteExtractor, - "#count" : 2, + "#urls" : ( + "https://realbooru.com//images/20/3e/0c2c4d8c978355c053602dc963eb13136c1614c1.jpeg", + ), }, { @@ -35,14 +41,14 @@ __tests__ = ( "#category": ("gelbooru_v02", "realbooru", "post"), "#class" : gelbooru_v02.GelbooruV02PostExtractor, "#options" : {"tags": True}, - "#urls" : "https://realbooru.com/images/8a/34/8a345820da989637c21ac013d522bf69.jpeg", + "#urls" : "https://realbooru.com//images/8a/34/8a345820da989637c21ac013d522bf69.jpeg", "#sha1_content": "f6213e6f25c3cb9e3cfefa6d4b3a78e44b9dea5b", "change" : "1705562002", "created_at" : "Thu Jan 18 01:12:50 -0600 2024", "creator_id" : "32011", "date" : "dt:2024-01-18 07:12:50", - "file_url" : "https://realbooru.com/images/8a/34/8a345820da989637c21ac013d522bf69.jpeg", + "file_url" : "https://realbooru.com//images/8a/34/8a345820da989637c21ac013d522bf69.jpeg", "filename" : "8a345820da989637c21ac013d522bf69", "has_children" : "false", "has_comments" : "false", @@ -73,7 +79,6 @@ __tests__ = ( "#comment" : "older post", "#category": ("gelbooru_v02", "realbooru", "post"), "#class" : gelbooru_v02.GelbooruV02PostExtractor, - "#urls" : "https://realbooru.com/images/f9/c8/f9c80c00a6add48b1d0abd3bd3ed75af.jpg", "#sha1_content": "4a7424810f5f846c161b5d3b7c8b0a85a03368c8", }, diff --git a/test/results/slideshare.py b/test/results/slideshare.py index 9066f3a7..66dd480b 100644 --- a/test/results/slideshare.py +++ b/test/results/slideshare.py @@ -12,7 +12,7 @@ __tests__ = ( "#url" : "https://www.slideshare.net/Slideshare/get-started-with-slide-share", "#category": ("", "slideshare", "presentation"), "#class" : slideshare.SlidesharePresentationExtractor, - "#pattern" : r"https://image\.slidesharecdn\.com/getstartedwithslideshare-150520173821-lva1-app6892/95/get-started-with-slide-share-\d+-1024\.jpg\?cb=\d+", + "#pattern" : r"https://image\.slidesharecdn\.com/getstartedwithslideshare-150520173821-lva1-app6892/95/Getting-Started-With-SlideShare-\d+-1024\.jpg", "#count" : 19, "#sha1_content": "2b6a191eab60b3978fdacfecf2da302dd45bc108", @@ -30,7 +30,7 @@ __tests__ = ( "#comment" : "long title and description", "#category": ("", "slideshare", "presentation"), "#class" : slideshare.SlidesharePresentationExtractor, - "#sha1_url": "d8952260f8bec337dd809a958ec8091350393f6b", + "#sha1_url": "c2d0079cc3b05de0fd93b0d0b1f47ff2a32119b7", "title" : "Warum Sie nicht Ihren Mitarbeitenden ändern sollten, sondern Ihr Managementsystem", "description": "Mitarbeitende verhalten sich mehrheitlich so, wie das System es ihnen vorgibt. Welche Voraussetzungen es braucht, damit Ihre Mitarbeitenden ihr ganzes Herzblut einsetzen, bespricht Fredi Schmidli in diesem Referat.", @@ -41,7 +41,7 @@ __tests__ = ( "#comment" : "mobile URL", "#category": ("", "slideshare", "presentation"), "#class" : slideshare.SlidesharePresentationExtractor, - "#pattern" : r"https://image\.slidesharecdn\.com/introductiontofixedprosthodonticsfinal-110427200948-phpapp02/95/introduction-to-fixed-prosthodontics-\d+-1024\.jpg\?cb=\d+", + "#pattern" : r"https://image\.slidesharecdn\.com/introductiontofixedprosthodonticsfinal-110427200948-phpapp02/95/Introduction-to-fixed-prosthodontics-\d+-1024\.jpg", "#count" : 27, }, diff --git a/test/results/smugloli.py b/test/results/smugloli.py index f0176067..c71d054e 100644 --- a/test/results/smugloli.py +++ b/test/results/smugloli.py @@ -9,15 +9,15 @@ from gallery_dl.extractor import vichan __tests__ = ( { - "#url" : "https://smuglo.li/a/res/1187531.html", + "#url" : "https://smuglo.li/a/res/1143245.html", "#category": ("vichan", "smugloli", "thread"), "#class" : vichan.VichanThreadExtractor, "#pattern" : r"https://smug.+/a/src/\d+(-\d)?\.\w+", "#count" : ">= 50", "board" : "a", - "thread": "1187531", - "title" : "Buta no Liver wa Kanetsu Shiro", + "thread": "1143245", + "title": "Rabbit Rabbit Thread #4", }, { diff --git a/test/results/twitter.py b/test/results/twitter.py index 3599b32c..37aa6322 100644 --- a/test/results/twitter.py +++ b/test/results/twitter.py @@ -14,7 +14,7 @@ __tests__ = ( "#category": ("", "twitter", "user"), "#class" : twitter.TwitterUserExtractor, "#options" : {"include": "all"}, - "#pattern" : r"https://twitter\.com/supernaturepics/(photo|header_photo|timeline|tweets|media|with_replies|likes)$", + "#pattern" : r"https://x\.com/supernaturepics/(photo|header_photo|timeline|tweets|media|with_replies|likes)$", "#count" : 7, }, @@ -277,7 +277,7 @@ __tests__ = ( "#category": ("", "twitter", "hashtag"), "#class" : twitter.TwitterHashtagExtractor, "#pattern" : twitter.TwitterSearchExtractor.pattern, - "#urls" : "https://twitter.com/search?q=%23nature", + "#urls" : "https://x.com/search?q=%23nature", }, { @@ -626,7 +626,7 @@ The Washington Post writes, "Three weeks after the toxic train derailment in Ohi "#category": ("", "twitter", "quotes"), "#class" : twitter.TwitterQuotesExtractor, "#pattern" : twitter.TwitterSearchExtractor.pattern, - "#urls" : "https://twitter.com/search?q=quoted_tweet_id:1263832915173048321", + "#urls" : "https://x.com/search?q=quoted_tweet_id:1263832915173048321", }, {