mirror of
https://codeberg.org/polarisfm/youtube-dl
synced 2024-12-23 06:57:54 +01:00
Add format fallback
This commit is contained in:
parent
6a1ca41e17
commit
5260e68f64
18
youtube-dl
18
youtube-dl
@ -1320,18 +1320,24 @@ class YoutubeIE(InfoExtractor):
|
|||||||
if len(existing_formats) == 0:
|
if len(existing_formats) == 0:
|
||||||
self._downloader.trouble(u'ERROR: no known formats available for video')
|
self._downloader.trouble(u'ERROR: no known formats available for video')
|
||||||
return
|
return
|
||||||
if req_format is None:
|
if req_format is None or req_format == 'best':
|
||||||
video_url_list = [(existing_formats[0], url_map[existing_formats[0]])] # Best quality
|
video_url_list = [(existing_formats[0], url_map[existing_formats[0]])] # Best quality
|
||||||
elif req_format == 'worst':
|
elif req_format == 'worst':
|
||||||
video_url_list = [(existing_formats[len(existing_formats)-1], url_map[existing_formats[len(existing_formats)-1]])] # worst quality
|
video_url_list = [(existing_formats[len(existing_formats)-1], url_map[existing_formats[len(existing_formats)-1]])] # worst quality
|
||||||
elif req_format == '-1':
|
elif req_format in ('-1', 'all'):
|
||||||
video_url_list = [(f, url_map[f]) for f in existing_formats] # All formats
|
video_url_list = [(f, url_map[f]) for f in existing_formats] # All formats
|
||||||
else:
|
else:
|
||||||
# Specific format
|
# Specific formats. We pick the first in a slash-delimeted sequence.
|
||||||
if req_format not in url_map:
|
# For example, if '1/2/3/4' is requested and '2' and '4' are available, we pick '2'.
|
||||||
|
req_formats = req_format.split('/')
|
||||||
|
video_url_list = None
|
||||||
|
for rf in req_formats:
|
||||||
|
if rf in url_map:
|
||||||
|
video_url_list = [(rf, url_map[rf])]
|
||||||
|
break
|
||||||
|
if video_url_list is None:
|
||||||
self._downloader.trouble(u'ERROR: requested format not available')
|
self._downloader.trouble(u'ERROR: requested format not available')
|
||||||
return
|
return
|
||||||
video_url_list = [(req_format, url_map[req_format])] # Specific format
|
|
||||||
else:
|
else:
|
||||||
self._downloader.trouble(u'ERROR: no conn or url_encoded_fmt_stream_map information found in video info')
|
self._downloader.trouble(u'ERROR: no conn or url_encoded_fmt_stream_map information found in video info')
|
||||||
return
|
return
|
||||||
@ -3512,7 +3518,7 @@ def parseOpts():
|
|||||||
video_format.add_option('-f', '--format',
|
video_format.add_option('-f', '--format',
|
||||||
action='store', dest='format', metavar='FORMAT', help='video format code')
|
action='store', dest='format', metavar='FORMAT', help='video format code')
|
||||||
video_format.add_option('--all-formats',
|
video_format.add_option('--all-formats',
|
||||||
action='store_const', dest='format', help='download all available video formats', const='-1')
|
action='store_const', dest='format', help='download all available video formats', const='all')
|
||||||
video_format.add_option('--max-quality',
|
video_format.add_option('--max-quality',
|
||||||
action='store', dest='format_limit', metavar='FORMAT', help='highest quality format to download')
|
action='store', dest='format_limit', metavar='FORMAT', help='highest quality format to download')
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user