diff --git a/yt_dlp/extractor/wistia.py b/yt_dlp/extractor/wistia.py index df7ecb3cdc..e1673b6a58 100644 --- a/yt_dlp/extractor/wistia.py +++ b/yt_dlp/extractor/wistia.py @@ -193,12 +193,12 @@ class WistiaIE(WistiaBaseIE): 'info_dict': { 'id': 'a6ndpko1wg', 'ext': 'mp4', - 'title': 'Episode 2: Boxed Water\'s retention is thirsty', + 'title': 'BXO-S02-E02-Boxed_Water-v4.mp4', 'upload_date': '20210324', - 'description': 'md5:da5994c2c2d254833b412469d9666b7a', + 'description': 'md5:3b9296a45aa46010767451b3691b1105', 'duration': 966.0, 'timestamp': 1616614369, - 'thumbnail': 'https://embed-ssl.wistia.com/deliveries/53dc60239348dc9b9fba3755173ea4c2.png', + 'thumbnail': r're:https?://embed(?:-ssl)?\.wistia\.com/.+\.(?:jpg|png)', }, }, { 'url': 'wistia:5vd7p4bct5', @@ -211,7 +211,7 @@ class WistiaIE(WistiaBaseIE): 'upload_date': '20220915', 'timestamp': 1663258727, 'duration': 623.019, - 'thumbnail': r're:https?://embed(?:-ssl)?.wistia.com/.+\.jpg$', + 'thumbnail': r're:https?://embed(?:-ssl)?\.wistia\.com/.+\.(?:jpg|png)', }, }, { 'url': 'wistia:sh7fpupwlt', @@ -226,7 +226,6 @@ class WistiaIE(WistiaBaseIE): 'url': 'http://fast.wistia.net/embed/medias/sh7fpupwlt.json', 'only_matching': True, }] - _WEBPAGE_TESTS = [{ 'url': 'https://www.weidert.com/blog/wistia-channels-video-marketing-tool', 'info_dict': { @@ -237,8 +236,9 @@ class WistiaIE(WistiaBaseIE): 'timestamp': 1618974400, 'description': 'md5:27abc99a758573560be72600ef95cece', 'upload_date': '20210421', - 'thumbnail': 'https://embed-ssl.wistia.com/deliveries/6c551820ae950cdee2306d6cbe9ef742.jpg', + 'thumbnail': r're:https?://embed(?:-ssl)?\.wistia\.com/.+\.(?:jpg|png)', }, + 'skip': 'Invalid URL', }, { 'url': 'https://study.com/academy/lesson/north-american-exploration-failed-colonies-of-spain-france-england.html#lesson', 'md5': 'b9676d24bf30945d97060638fbfe77f0', @@ -249,9 +249,19 @@ class WistiaIE(WistiaBaseIE): 'upload_date': '20220915', 'timestamp': 1663258727, 'duration': 623.019, - 'thumbnail': 'https://embed-ssl.wistia.com/deliveries/83e6ec693e2c05a0ce65809cbaead86a.jpg', + 'thumbnail': r're:https?://embed(?:-ssl)?\.wistia\.com/.+\.(?:jpg|png)', 'description': 'a Paywall Videos video', }, + }, { + 'url': 'https://support.wistia.com/en/articles/8233354-embedding-your-media', + 'info_dict': { + 'id': '8233354-embedding-your-media', + 'title': 'Embedding Your Media | Wistia Help Center', + 'age_limit': 0, + 'description': 'md5:32a5edc0e266cd61e2d15be28873d614', + 'thumbnail': r're:https?://downloads\.intercomcdn\.com/.+\.jpg', + }, + 'playlist_count': 2, }] def _real_extract(self, url): @@ -278,13 +288,13 @@ def _extract_embed_urls(cls, url, webpage): class WistiaPlaylistIE(WistiaBaseIE): _VALID_URL = rf'{WistiaBaseIE._VALID_URL_BASE}playlists/{WistiaBaseIE._VALID_ID_REGEX}' - _TEST = { + _TESTS = [{ 'url': 'https://fast.wistia.net/embed/playlists/aodt9etokc', 'info_dict': { 'id': 'aodt9etokc', }, 'playlist_count': 3, - } + }] def _real_extract(self, url): playlist_id = self._match_id(url) @@ -312,7 +322,7 @@ class WistiaChannelIE(WistiaBaseIE): 'description': 'Learn all things Copysmith via short and informative videos!', }, 'playlist_mincount': 7, - 'expected_warnings': ['falling back to webpage'], + 'skip': 'Invalid URL', }, { 'url': 'https://fast.wistia.net/embed/channel/3802iirk0l', 'info_dict': { @@ -327,9 +337,9 @@ class WistiaChannelIE(WistiaBaseIE): 'id': 'sp5dqjzw3n', 'ext': 'mp4', 'title': 'The Roof S2: The Modern CRO', - 'thumbnail': 'https://embed-ssl.wistia.com/deliveries/dadfa9233eaa505d5e0c85c23ff70741.png', + 'thumbnail': r're:https?://embed(?:-ssl)?\.wistia\.com/.+\.(?:jpg|png)', 'duration': 86.487, - 'description': 'A sales leader on The Roof? Man, they really must be letting anyone up here this season.\n', + 'description': 'md5:4f60fa590babd92e7db2fb53372a1711', 'timestamp': 1619790290, 'upload_date': '20210430', }, @@ -343,6 +353,7 @@ class WistiaChannelIE(WistiaBaseIE): 'description': 'md5:14a8a93a1dbe236718e6a59f8c8c7bae', }, 'playlist_mincount': 30, + 'skip': 'Site changed', }, { # section instead of div 'url': 'https://360learning.com/studio/onboarding-joei/', @@ -362,9 +373,9 @@ class WistiaChannelIE(WistiaBaseIE): 'upload_date': '20220530', 'description': 'Learn how to help your company improve and achieve your product related goals.', 'duration': 1854.39, - 'thumbnail': 'https://embed-ssl.wistia.com/deliveries/12fd19e56413d9d6f04e2185c16a6f8854e25226.png', + 'thumbnail': r're:https?://embed(?:-ssl)?\.wistia\.com/.+\.(?:jpg|png)', }, - 'params': {'noplaylist': True, 'skip_download': True}, + 'skip': 'Invalid URL', }] def _real_extract(self, url):