From: rzhxeo Date: Wed, 18 Dec 2013 20:24:39 +0000 (+0100) Subject: Filter and sort videos before calling list_formats X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=bfaae0a768d455112e003f6200edfdafb22affd6;p=youtube-dl Filter and sort videos before calling list_formats --- diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 74c0db4fc..fd26f00b7 100644 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -662,10 +662,6 @@ class YoutubeDL(object): if 'ext' not in format: 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) if format_limit: formats = list(takewhile_inclusive( @@ -681,6 +677,11 @@ class YoutubeDL(object): return (f.get('height'), f.get('width'), ext_ord) 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') if req_format is None: req_format = 'best'