From f3a95abbfc574162bf21babc1ca015dde841770b Mon Sep 17 00:00:00 2001 From: remitamine Date: Tue, 29 Dec 2015 23:35:27 +0100 Subject: [PATCH 1/2] [common] fail only if the extractor didn't return formats --- youtube_dl/YoutubeDL.py | 2 ++ youtube_dl/extractor/common.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 50425b8d7..f25b1d2aa 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -1208,6 +1208,8 @@ class YoutubeDL(object): raise ExtractorError('Missing "id" field in extractor result') if 'title' not in info_dict: raise ExtractorError('Missing "title" field in extractor result') + if not info_dict.get('formats'): + raise ExtractorError('No video formats found') if 'playlist' not in info_dict: # It isn't part of a playlist diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 655207447..5230bc629 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -765,7 +765,7 @@ class InfoExtractor(object): def _sort_formats(self, formats, field_preference=None): if not formats: - raise ExtractorError('No video formats found') + return def _formats_key(f): # TODO remove the following workaround From a5e50c2ebec539965c059222190ebe2a0f0cccbc Mon Sep 17 00:00:00 2001 From: remitamine Date: Fri, 1 Jan 2016 16:02:32 +0100 Subject: [PATCH 2/2] [YoutubeDL] remove duplicate check for formats existence --- youtube_dl/YoutubeDL.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index f25b1d2aa..50425b8d7 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -1208,8 +1208,6 @@ class YoutubeDL(object): raise ExtractorError('Missing "id" field in extractor result') if 'title' not in info_dict: raise ExtractorError('Missing "title" field in extractor result') - if not info_dict.get('formats'): - raise ExtractorError('No video formats found') if 'playlist' not in info_dict: # It isn't part of a playlist