From a331949df396d69e648fad61a80ada5da3279704 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Sat, 6 Nov 2021 07:24:49 +0530 Subject: [PATCH] [test/download] Fallback test to `bv` --- test/parameters.json | 2 +- yt_dlp/extractor/atresplayer.py | 3 --- yt_dlp/extractor/bandaichannel.py | 1 - yt_dlp/extractor/corus.py | 1 - yt_dlp/extractor/curiositystream.py | 1 - yt_dlp/extractor/discoverynetworks.py | 1 - yt_dlp/extractor/discoveryplusindia.py | 1 - yt_dlp/extractor/dplay.py | 6 ------ yt_dlp/extractor/egghead.py | 1 - yt_dlp/extractor/fancode.py | 1 - yt_dlp/extractor/generic.py | 3 --- yt_dlp/extractor/internazionale.py | 6 ------ yt_dlp/extractor/kinopoisk.py | 3 --- yt_dlp/extractor/n1.py | 1 - yt_dlp/extractor/nexx.py | 1 - yt_dlp/extractor/nrl.py | 1 - yt_dlp/extractor/olympics.py | 1 - yt_dlp/extractor/paramountplus.py | 2 -- yt_dlp/extractor/parliamentliveuk.py | 3 --- yt_dlp/extractor/peloton.py | 1 - yt_dlp/extractor/pornflip.py | 1 - yt_dlp/extractor/rcti.py | 5 ----- yt_dlp/extractor/reddit.py | 4 ---- yt_dlp/extractor/rmcdecouverte.py | 1 - yt_dlp/extractor/sevenplus.py | 1 - yt_dlp/extractor/slideslive.py | 3 --- yt_dlp/extractor/svt.py | 1 - yt_dlp/extractor/telequebec.py | 12 ------------ yt_dlp/extractor/tf1.py | 1 - yt_dlp/extractor/tvplay.py | 1 - yt_dlp/extractor/vice.py | 1 - yt_dlp/extractor/viki.py | 12 ------------ yt_dlp/extractor/wakanim.py | 1 - yt_dlp/extractor/watchbox.py | 2 -- 34 files changed, 1 insertion(+), 85 deletions(-) diff --git a/test/parameters.json b/test/parameters.json index 8544f1ab2..bc4561374 100644 --- a/test/parameters.json +++ b/test/parameters.json @@ -9,7 +9,7 @@ "forcetitle": false, "forceurl": false, "force_write_download_archive": false, - "format": "best", + "format": "b/bv", "ignoreerrors": false, "listformats": null, "logtostderr": false, diff --git a/yt_dlp/extractor/atresplayer.py b/yt_dlp/extractor/atresplayer.py index 8143eb4d7..6d843966a 100644 --- a/yt_dlp/extractor/atresplayer.py +++ b/yt_dlp/extractor/atresplayer.py @@ -24,9 +24,6 @@ class AtresPlayerIE(InfoExtractor): 'description': 'md5:7634cdcb4d50d5381bedf93efb537fbc', 'duration': 3413, }, - 'params': { - 'format': 'bestvideo', - }, 'skip': 'This video is only available for registered users' }, { diff --git a/yt_dlp/extractor/bandaichannel.py b/yt_dlp/extractor/bandaichannel.py index d67285913..f1bcdef7a 100644 --- a/yt_dlp/extractor/bandaichannel.py +++ b/yt_dlp/extractor/bandaichannel.py @@ -21,7 +21,6 @@ class BandaiChannelIE(BrightcoveNewIE): 'duration': 1387.733, }, 'params': { - 'format': 'bestvideo', 'skip_download': True, }, }] diff --git a/yt_dlp/extractor/corus.py b/yt_dlp/extractor/corus.py index 352951e20..119461375 100644 --- a/yt_dlp/extractor/corus.py +++ b/yt_dlp/extractor/corus.py @@ -55,7 +55,6 @@ class CorusIE(ThePlatformFeedIE): 'timestamp': 1486392197, }, 'params': { - 'format': 'bestvideo', 'skip_download': True, }, 'expected_warnings': ['Failed to parse JSON'], diff --git a/yt_dlp/extractor/curiositystream.py b/yt_dlp/extractor/curiositystream.py index 034a5c92a..41c0f845a 100644 --- a/yt_dlp/extractor/curiositystream.py +++ b/yt_dlp/extractor/curiositystream.py @@ -59,7 +59,6 @@ class CuriosityStreamIE(CuriosityStreamBaseIE): 'description': 'Vint Cerf, Google\'s Chief Internet Evangelist, describes how he and Bob Kahn created the internet.', }, 'params': { - 'format': 'bestvideo', # m3u8 download 'skip_download': True, }, diff --git a/yt_dlp/extractor/discoverynetworks.py b/yt_dlp/extractor/discoverynetworks.py index f43c87160..4f8bdf0b9 100644 --- a/yt_dlp/extractor/discoverynetworks.py +++ b/yt_dlp/extractor/discoverynetworks.py @@ -19,7 +19,6 @@ class DiscoveryNetworksDeIE(DPlayIE): 'upload_date': '20190331', }, 'params': { - 'format': 'bestvideo', 'skip_download': True, }, }, { diff --git a/yt_dlp/extractor/discoveryplusindia.py b/yt_dlp/extractor/discoveryplusindia.py index 51801402c..8ec418a97 100644 --- a/yt_dlp/extractor/discoveryplusindia.py +++ b/yt_dlp/extractor/discoveryplusindia.py @@ -28,7 +28,6 @@ class DiscoveryPlusIndiaIE(DPlayIE): 'creator': 'Discovery Channel', }, 'params': { - 'format': 'bestvideo', 'skip_download': True, }, 'skip': 'Cookies (not necessarily logged in) are needed' diff --git a/yt_dlp/extractor/dplay.py b/yt_dlp/extractor/dplay.py index d62480810..525c8e243 100644 --- a/yt_dlp/extractor/dplay.py +++ b/yt_dlp/extractor/dplay.py @@ -46,7 +46,6 @@ class DPlayIE(InfoExtractor): 'episode_number': 1, }, 'params': { - 'format': 'bestvideo', 'skip_download': True, }, }, { @@ -67,7 +66,6 @@ class DPlayIE(InfoExtractor): 'episode_number': 1, }, 'params': { - 'format': 'bestvideo', 'skip_download': True, }, }, { @@ -87,7 +85,6 @@ class DPlayIE(InfoExtractor): 'episode_number': 7, }, 'params': { - 'format': 'bestvideo', 'skip_download': True, }, 'skip': 'Available for Premium users', @@ -313,9 +310,6 @@ class HGTVDeIE(DPlayIE): 'season_number': 3, 'episode_number': 3, }, - 'params': { - 'format': 'bestvideo', - }, }] def _real_extract(self, url): diff --git a/yt_dlp/extractor/egghead.py b/yt_dlp/extractor/egghead.py index f6b50e7c2..b6b86768c 100644 --- a/yt_dlp/extractor/egghead.py +++ b/yt_dlp/extractor/egghead.py @@ -86,7 +86,6 @@ class EggheadLessonIE(EggheadBaseIE): }, 'params': { 'skip_download': True, - 'format': 'bestvideo', }, }, { 'url': 'https://egghead.io/api/v1/lessons/react-add-redux-to-a-react-application', diff --git a/yt_dlp/extractor/fancode.py b/yt_dlp/extractor/fancode.py index 912feb702..f6733b124 100644 --- a/yt_dlp/extractor/fancode.py +++ b/yt_dlp/extractor/fancode.py @@ -21,7 +21,6 @@ class FancodeVodIE(InfoExtractor): 'url': 'https://fancode.com/video/15043/match-preview-pbks-vs-mi', 'params': { 'skip_download': True, - 'format': 'bestvideo' }, 'info_dict': { 'id': '6249806281001', diff --git a/yt_dlp/extractor/generic.py b/yt_dlp/extractor/generic.py index 0d279016b..26f9497f1 100644 --- a/yt_dlp/extractor/generic.py +++ b/yt_dlp/extractor/generic.py @@ -359,9 +359,6 @@ class GenericIE(InfoExtractor): 'formats': 'mincount:9', 'upload_date': '20130904', }, - 'params': { - 'format': 'bestvideo', - }, }, # m3u8 served with Content-Type: audio/x-mpegURL; charset=utf-8 { diff --git a/yt_dlp/extractor/internazionale.py b/yt_dlp/extractor/internazionale.py index 676e8e269..45e2af690 100644 --- a/yt_dlp/extractor/internazionale.py +++ b/yt_dlp/extractor/internazionale.py @@ -20,9 +20,6 @@ class InternazionaleIE(InfoExtractor): 'upload_date': '20150219', 'thumbnail': r're:^https?://.*\.jpg$', }, - 'params': { - 'format': 'bestvideo', - }, }, { 'url': 'https://www.internazionale.it/video/2018/08/29/telefono-stare-con-noi-stessi', 'md5': '9db8663704cab73eb972d1cee0082c79', @@ -36,9 +33,6 @@ class InternazionaleIE(InfoExtractor): 'upload_date': '20180829', 'thumbnail': r're:^https?://.*\.jpg$', }, - 'params': { - 'format': 'bestvideo', - }, }] def _real_extract(self, url): diff --git a/yt_dlp/extractor/kinopoisk.py b/yt_dlp/extractor/kinopoisk.py index 9e8d01f53..cdbb642e2 100644 --- a/yt_dlp/extractor/kinopoisk.py +++ b/yt_dlp/extractor/kinopoisk.py @@ -23,9 +23,6 @@ class KinoPoiskIE(InfoExtractor): 'duration': 4533, 'age_limit': 12, }, - 'params': { - 'format': 'bestvideo', - }, }, { 'url': 'https://www.kinopoisk.ru/film/81041', 'only_matching': True, diff --git a/yt_dlp/extractor/n1.py b/yt_dlp/extractor/n1.py index 75d63c893..fdb7f32db 100644 --- a/yt_dlp/extractor/n1.py +++ b/yt_dlp/extractor/n1.py @@ -88,7 +88,6 @@ class N1InfoIIE(InfoExtractor): 'uploader': 'YouLotWhatDontStop', }, 'params': { - 'format': 'bestvideo', 'skip_download': True, }, }, { diff --git a/yt_dlp/extractor/nexx.py b/yt_dlp/extractor/nexx.py index 860d636e2..a30108483 100644 --- a/yt_dlp/extractor/nexx.py +++ b/yt_dlp/extractor/nexx.py @@ -427,7 +427,6 @@ class NexxEmbedIE(InfoExtractor): 'upload_date': '20140305', }, 'params': { - 'format': 'bestvideo', 'skip_download': True, }, }, { diff --git a/yt_dlp/extractor/nrl.py b/yt_dlp/extractor/nrl.py index 22a2df8d3..0bd5086ae 100644 --- a/yt_dlp/extractor/nrl.py +++ b/yt_dlp/extractor/nrl.py @@ -16,7 +16,6 @@ class NRLTVIE(InfoExtractor): 'params': { # m3u8 download 'skip_download': True, - 'format': 'bestvideo', }, } diff --git a/yt_dlp/extractor/olympics.py b/yt_dlp/extractor/olympics.py index bca1f1928..0aad836fa 100644 --- a/yt_dlp/extractor/olympics.py +++ b/yt_dlp/extractor/olympics.py @@ -21,7 +21,6 @@ class OlympicsReplayIE(InfoExtractor): 'description': 'md5:c66af4a5bc7429dbcc43d15845ff03b3', }, 'params': { - 'format': 'bestvideo', 'skip_download': True, }, }, { diff --git a/yt_dlp/extractor/paramountplus.py b/yt_dlp/extractor/paramountplus.py index 338b84d5b..17138985a 100644 --- a/yt_dlp/extractor/paramountplus.py +++ b/yt_dlp/extractor/paramountplus.py @@ -60,7 +60,6 @@ class ParamountPlusIE(CBSBaseIE): }, 'params': { 'skip_download': 'm3u8', - 'format': 'bestvideo', }, 'expected_warnings': ['Ignoring subtitle tracks'], # TODO: Investigate this }, { @@ -76,7 +75,6 @@ class ParamountPlusIE(CBSBaseIE): }, 'params': { 'skip_download': 'm3u8', - 'format': 'bestvideo', }, 'expected_warnings': ['Ignoring subtitle tracks'], }, { diff --git a/yt_dlp/extractor/parliamentliveuk.py b/yt_dlp/extractor/parliamentliveuk.py index 869ebd865..974d65482 100644 --- a/yt_dlp/extractor/parliamentliveuk.py +++ b/yt_dlp/extractor/parliamentliveuk.py @@ -25,9 +25,6 @@ class ParliamentLiveUKIE(InfoExtractor): 'timestamp': 1395153872, 'upload_date': '20140318', }, - 'params': { - 'format': 'bestvideo', - }, }, { 'url': 'http://parliamentlive.tv/event/index/3f24936f-130f-40bf-9a5d-b3d6479da6a4', 'only_matching': True, diff --git a/yt_dlp/extractor/peloton.py b/yt_dlp/extractor/peloton.py index 287d341c9..7d832253f 100644 --- a/yt_dlp/extractor/peloton.py +++ b/yt_dlp/extractor/peloton.py @@ -203,7 +203,6 @@ class PelotonLiveIE(InfoExtractor): 'chapters': 'count:3' }, 'params': { - 'format': 'bestvideo', 'skip_download': 'm3u8', }, '_skip': 'Account needed' diff --git a/yt_dlp/extractor/pornflip.py b/yt_dlp/extractor/pornflip.py index d0aefa2dd..accf45269 100644 --- a/yt_dlp/extractor/pornflip.py +++ b/yt_dlp/extractor/pornflip.py @@ -29,7 +29,6 @@ class PornFlipIE(InfoExtractor): 'age_limit': 18, }, 'params': { - 'format': 'bestvideo', 'skip_download': True, }, }, diff --git a/yt_dlp/extractor/rcti.py b/yt_dlp/extractor/rcti.py index 31d9779dd..19b2f451c 100644 --- a/yt_dlp/extractor/rcti.py +++ b/yt_dlp/extractor/rcti.py @@ -85,9 +85,6 @@ class RCTIPlusIE(RCTIPlusBaseIE): 'series': 'iNews Malam', 'channel': 'INews', }, - 'params': { - 'format': 'bestvideo', - }, }, { # Missed event/replay 'url': 'https://www.rctiplus.com/missed-event/2507/mou-signing-ceremony-27-juli-2021-1400-wib', 'md5': '649c5f27250faed1452ca8b91e06922d', @@ -132,7 +129,6 @@ class RCTIPlusIE(RCTIPlusBaseIE): }, 'params': { 'skip_download': True, - 'format': 'bestvideo', }, }] _CONVIVA_JSON_TEMPLATE = { @@ -329,7 +325,6 @@ class RCTIPlusTVIE(RCTIPlusBaseIE): }, 'params': { 'skip_download': True, - 'format': 'bestvideo', } }, { # Returned video will always change diff --git a/yt_dlp/extractor/reddit.py b/yt_dlp/extractor/reddit.py index c75d95a8e..3ea750aeb 100644 --- a/yt_dlp/extractor/reddit.py +++ b/yt_dlp/extractor/reddit.py @@ -22,9 +22,6 @@ class RedditIE(InfoExtractor): 'ext': 'mp4', 'title': 'zv89llsvexdz', }, - 'params': { - 'format': 'bestvideo', - }, } def _real_extract(self, url): @@ -67,7 +64,6 @@ class RedditRIE(InfoExtractor): 'age_limit': 0, }, 'params': { - 'format': 'bestvideo', 'skip_download': True, }, }, { diff --git a/yt_dlp/extractor/rmcdecouverte.py b/yt_dlp/extractor/rmcdecouverte.py index 422d47ae9..8bfce3416 100644 --- a/yt_dlp/extractor/rmcdecouverte.py +++ b/yt_dlp/extractor/rmcdecouverte.py @@ -26,7 +26,6 @@ class RMCDecouverteIE(InfoExtractor): 'upload_date': '20210428', }, 'params': { - 'format': 'bestvideo', 'skip_download': True, }, }, { diff --git a/yt_dlp/extractor/sevenplus.py b/yt_dlp/extractor/sevenplus.py index 210c44ab2..9867961f0 100644 --- a/yt_dlp/extractor/sevenplus.py +++ b/yt_dlp/extractor/sevenplus.py @@ -35,7 +35,6 @@ class SevenPlusIE(BrightcoveNewIE): 'episode': 'Wind Surf', }, 'params': { - 'format': 'bestvideo', 'skip_download': True, } }, { diff --git a/yt_dlp/extractor/slideslive.py b/yt_dlp/extractor/slideslive.py index 9409a0100..df6084647 100644 --- a/yt_dlp/extractor/slideslive.py +++ b/yt_dlp/extractor/slideslive.py @@ -35,9 +35,6 @@ class SlidesLiveIE(InfoExtractor): 'ext': 'mp4', 'title': 'Offline Reinforcement Learning: From Algorithms to Practical Challenges', }, - 'params': { - 'format': 'bestvideo', - }, }, { # video_service_name = youtube 'url': 'https://slideslive.com/38903721/magic-a-scientific-resurrection-of-an-esoteric-legend', diff --git a/yt_dlp/extractor/svt.py b/yt_dlp/extractor/svt.py index 38e0086b3..489f197fe 100644 --- a/yt_dlp/extractor/svt.py +++ b/yt_dlp/extractor/svt.py @@ -168,7 +168,6 @@ class SVTPlayIE(SVTPlayBaseIE): }, }, 'params': { - 'format': 'bestvideo', # skip for now due to download test asserts that segment is > 10000 bytes and svt uses # init segments that are smaller # AssertionError: Expected test_SVTPlay_jNwpV9P.mp4 to be at least 9.77KiB, but it's only 864.00B diff --git a/yt_dlp/extractor/telequebec.py b/yt_dlp/extractor/telequebec.py index 800d87b70..4bef2fe76 100644 --- a/yt_dlp/extractor/telequebec.py +++ b/yt_dlp/extractor/telequebec.py @@ -43,9 +43,6 @@ class TeleQuebecIE(TeleQuebecBaseIE): 'uploader_id': '6150020952001', 'upload_date': '20200512', }, - 'params': { - 'format': 'bestvideo', - }, 'add_ie': ['BrightcoveNew'], }, { 'url': 'https://zonevideo.telequebec.tv/media/55267/le-soleil/passe-partout', @@ -58,9 +55,6 @@ class TeleQuebecIE(TeleQuebecBaseIE): 'upload_date': '20200625', 'timestamp': 1593090307, }, - 'params': { - 'format': 'bestvideo', - }, 'add_ie': ['BrightcoveNew'], }, { # no description @@ -157,9 +151,6 @@ class TeleQuebecEmissionIE(InfoExtractor): 'timestamp': 1588713424, 'uploader_id': '6150020952001', }, - 'params': { - 'format': 'bestvideo', - }, }, { 'url': 'http://bancpublic.telequebec.tv/emissions/emission-49/31986/jeunes-meres-sous-pression', 'only_matching': True, @@ -220,9 +211,6 @@ class TeleQuebecVideoIE(TeleQuebecBaseIE): 'timestamp': 1603115930, 'uploader_id': '6101674910001', }, - 'params': { - 'format': 'bestvideo', - }, }, { 'url': 'https://video.telequebec.tv/player-live/28527', 'only_matching': True, diff --git a/yt_dlp/extractor/tf1.py b/yt_dlp/extractor/tf1.py index 669eb5015..44785bc65 100644 --- a/yt_dlp/extractor/tf1.py +++ b/yt_dlp/extractor/tf1.py @@ -29,7 +29,6 @@ class TF1IE(InfoExtractor): 'params': { # Sometimes wat serves the whole file with the --test option 'skip_download': True, - 'format': 'bestvideo', }, }, { 'url': 'http://www.tf1.fr/tf1/koh-lanta/videos/replay-koh-lanta-22-mai-2015.html', diff --git a/yt_dlp/extractor/tvplay.py b/yt_dlp/extractor/tvplay.py index fbafb41f8..9771d9108 100644 --- a/yt_dlp/extractor/tvplay.py +++ b/yt_dlp/extractor/tvplay.py @@ -369,7 +369,6 @@ class ViafreeIE(InfoExtractor): 'upload_date': '20201217' }, 'params': { - 'format': 'bestvideo', 'skip_download': True } }, { diff --git a/yt_dlp/extractor/vice.py b/yt_dlp/extractor/vice.py index ca4d3edbd..c8c30559e 100644 --- a/yt_dlp/extractor/vice.py +++ b/yt_dlp/extractor/vice.py @@ -290,7 +290,6 @@ class ViceArticleIE(ViceBaseIE): }, 'params': { 'skip_download': True, - 'format': 'bestvideo', }, 'add_ie': [ViceIE.ie_key()], }, { diff --git a/yt_dlp/extractor/viki.py b/yt_dlp/extractor/viki.py index acb5ae550..6a3c5532d 100644 --- a/yt_dlp/extractor/viki.py +++ b/yt_dlp/extractor/viki.py @@ -135,9 +135,6 @@ class VikiIE(VikiBaseIE): 'uploader': 'FCC', 'upload_date': '20201127', }, - 'params': { - 'format': 'bestvideo', - }, }, { 'url': 'http://www.viki.com/videos/1023585v-heirs-episode-14', 'info_dict': { @@ -151,9 +148,6 @@ class VikiIE(VikiBaseIE): 'duration': 3570, 'episode_number': 14, }, - 'params': { - 'format': 'bestvideo', - }, 'skip': 'Blocked in the US', }, { # clip @@ -203,9 +197,6 @@ class VikiIE(VikiBaseIE): 'age_limit': 13, 'episode_number': 1, }, - 'params': { - 'format': 'bestvideo', - }, }, { # youtube external 'url': 'http://www.viki.com/videos/50562v-poor-nastya-complete-episode-1', @@ -241,9 +232,6 @@ class VikiIE(VikiBaseIE): 'title': 'Love In Magic', 'age_limit': 13, }, - 'params': { - 'format': 'bestvideo', - }, }] def _real_extract(self, url): diff --git a/yt_dlp/extractor/wakanim.py b/yt_dlp/extractor/wakanim.py index a61a630e2..a70a71961 100644 --- a/yt_dlp/extractor/wakanim.py +++ b/yt_dlp/extractor/wakanim.py @@ -25,7 +25,6 @@ class WakanimIE(InfoExtractor): 'episode_number': 2, }, 'params': { - 'format': 'bestvideo', 'skip_download': True, }, }, { diff --git a/yt_dlp/extractor/watchbox.py b/yt_dlp/extractor/watchbox.py index 7469fe962..d19d80102 100644 --- a/yt_dlp/extractor/watchbox.py +++ b/yt_dlp/extractor/watchbox.py @@ -30,7 +30,6 @@ class WatchBoxIE(InfoExtractor): 'release_year': 2009, }, 'params': { - 'format': 'bestvideo', 'skip_download': True, }, 'expected_warnings': ['Failed to download m3u8 information'], @@ -52,7 +51,6 @@ class WatchBoxIE(InfoExtractor): 'episode_number': 1, }, 'params': { - 'format': 'bestvideo', 'skip_download': True, }, 'expected_warnings': ['Failed to download m3u8 information'],