diff options
| author | Sergey M․ <dstftw@gmail.com> | 2014-08-09 05:45:15 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2014-08-09 05:45:15 +0700 |
| commit | fb17b60811ea89fb857ab03a997d193898046466 (patch) | |
| tree | 0d5975f57a5904822a06a958ac25cb22f249ff1b | |
| parent | 1e5880426044d4f529daf5def9d946e4739b16d0 (diff) | |
| download | youtube-dl-fb17b60811ea89fb857ab03a997d193898046466.tar.xz | |
[arte] Do not filter formats when there are no videos of requested lang code (Closes #3433)
| -rw-r--r-- | youtube_dl/extractor/arte.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/youtube_dl/extractor/arte.py b/youtube_dl/extractor/arte.py index 9591bad8a..d86dbba8e 100644 --- a/youtube_dl/extractor/arte.py +++ b/youtube_dl/extractor/arte.py @@ -109,15 +109,19 @@ class ArteTVPlus7IE(InfoExtractor): regexes = [r'VO?%s' % l, r'VO?.-ST%s' % l] return any(re.match(r, f['versionCode']) for r in regexes) # Some formats may not be in the same language as the url + # TODO: Might want not to drop videos that does not match requested language + # but to process those formats with lower precedence formats = filter(_match_lang, all_formats) - formats = list(formats) # in python3 filter returns an iterator + formats = list(formats) # in python3 filter returns an iterator if not formats: # Some videos are only available in the 'Originalversion' # they aren't tagged as being in French or German - if all(f['versionCode'] == 'VO' or f['versionCode'] == 'VA' for f in all_formats): - formats = all_formats - else: - raise ExtractorError(u'The formats list is empty') + # Sometimes there are neither videos of requested lang code + # nor original version videos available + # For such cases we just take all_formats as is + formats = all_formats + if not formats: + raise ExtractorError('The formats list is empty') if re.match(r'[A-Z]Q', formats[0]['quality']) is not None: def sort_key(f): |