diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-02-19 00:28:58 +0100 | 
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-02-19 00:28:58 +0100 | 
| commit | b81a359eb67aea83799f1306a441fd6163bf1840 (patch) | |
| tree | b74a84ddfe511a464a9e288735d19514de065d8c | |
| parent | d61aefb24c96d8b45aed63cfdcfec0c157a24ba5 (diff) | |
[YoutubeDL] Use render_table for format listing
| -rwxr-xr-x | youtube_dl/YoutubeDL.py | 25 | 
1 files changed, 7 insertions, 18 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index b087d356f..88809783b 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -1534,29 +1534,18 @@ class YoutubeDL(object):          return res      def list_formats(self, info_dict): -        def line(format, idlen=20): -            return (('%-' + compat_str(idlen + 1) + 's%-10s%-12s%s') % ( -                format['format_id'], -                format['ext'], -                self.format_resolution(format), -                self._format_note(format), -            )) -          formats = info_dict.get('formats', [info_dict]) -        idlen = max(len('format code'), -                    max(len(f['format_id']) for f in formats)) -        formats_s = [ -            line(f, idlen) for f in formats +        table = [ +            [f['format_id'], f['ext'], self.format_resolution(f), self._format_note(f)] +            for f in formats              if f.get('preference') is None or f['preference'] >= -1000]          if len(formats) > 1: -            formats_s[-1] += (' ' if self._format_note(formats[-1]) else '') + '(best)' +            table[-1][-1] += (' ' if table[-1][-1] else '') + '(best)' -        header_line = line({ -            'format_id': 'format code', 'ext': 'extension', -            'resolution': 'resolution', 'format_note': 'note'}, idlen=idlen) +        header_line = ['format code', 'extension', 'resolution', 'note']          self.to_screen( -            '[info] Available formats for %s:\n%s\n%s' % -            (info_dict['id'], header_line, '\n'.join(formats_s))) +            '[info] Available formats for %s:\n%s' % +            (info_dict['id'], render_table(header_line, table)))      def list_thumbnails(self, info_dict):          thumbnails = info_dict.get('thumbnails')  | 
