mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-08-17 11:20:29 +02:00
Make "all-formats" and "best-quality" download the version without specific format too
This commit is contained in:
parent
7e58d56888
commit
2bebb386b8
@ -891,21 +891,18 @@ class YoutubeIE(InfoExtractor):
|
|||||||
})
|
})
|
||||||
|
|
||||||
if all_formats:
|
if all_formats:
|
||||||
if quality_index == len(self._available_formats) - 1:
|
if quality_index == len(self._available_formats):
|
||||||
# None left to get
|
# None left to get
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
quality_index += 1
|
quality_index += 1
|
||||||
format_param = self._available_formats[quality_index]
|
format_param = self._available_formats[quality_index]
|
||||||
if format_param == None:
|
|
||||||
return
|
|
||||||
continue
|
continue
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
except UnavailableFormatError, err:
|
except UnavailableFormatError, err:
|
||||||
if best_quality or all_formats:
|
if best_quality or all_formats:
|
||||||
if quality_index == len(self._available_formats) - 1:
|
if quality_index == len(self._available_formats):
|
||||||
# I don't ever expect this to happen
|
# I don't ever expect this to happen
|
||||||
if not all_formats:
|
if not all_formats:
|
||||||
self._downloader.trouble(u'ERROR: no known formats available for video')
|
self._downloader.trouble(u'ERROR: no known formats available for video')
|
||||||
@ -914,8 +911,6 @@ class YoutubeIE(InfoExtractor):
|
|||||||
self.report_unavailable_format(video_id, format_param)
|
self.report_unavailable_format(video_id, format_param)
|
||||||
quality_index += 1
|
quality_index += 1
|
||||||
format_param = self._available_formats[quality_index]
|
format_param = self._available_formats[quality_index]
|
||||||
if format_param == None:
|
|
||||||
return
|
|
||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
self._downloader.trouble('ERROR: format not available for video')
|
self._downloader.trouble('ERROR: format not available for video')
|
||||||
|
Loading…
Reference in New Issue
Block a user