Upstream/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-13 20:57:14 +01:00
Code Issues Projects Releases Wiki Activity

Filter and sort videos before calling list_formats

Browse Source
This commit is contained in:
rzhxeo 2013-12-18 21:24:39 +01:00
parent e56f22ae20
commit bfaae0a768
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/YoutubeDL.py
View File

@ -662,10 +662,6 @@ class YoutubeDL(object):
if 'ext' not in format: if 'ext' not in format:
format['ext'] = determine_ext(format['url']) format['ext'] = determine_ext(format['url'])
if self.params.get('listformats', None):
self.list_formats(info_dict)
return
format_limit = self.params.get('format_limit', None) format_limit = self.params.get('format_limit', None)
if format_limit: if format_limit:
formats = list(takewhile_inclusive( formats = list(takewhile_inclusive(
@ -681,6 +677,11 @@ class YoutubeDL(object):
return (f.get('height'), f.get('width'), ext_ord) return (f.get('height'), f.get('width'), ext_ord)
formats = sorted(formats, key=_free_formats_key) formats = sorted(formats, key=_free_formats_key)
info_dict['formats'] = formats
if self.params.get('listformats', None):
self.list_formats(info_dict)
return
req_format = self.params.get('format', 'best') req_format = self.params.get('format', 'best')
if req_format is None: if req_format is None:
req_format = 'best' req_format = 'best'