pull/189/head
pukkandan 5 years ago
parent e4037c1df5
commit 4143454527

@ -2342,7 +2342,7 @@ class YoutubeDL(object):
self.to_screen( self.to_screen(
'[info] Available formats for %s:\n%s' % (info_dict['id'], render_table( '[info] Available formats for %s:\n%s' % (info_dict['id'], render_table(
header_line, header_line,
table, table,
delim=new_format, delim=new_format,
extraGap=(0 if new_format else 1), extraGap=(0 if new_format else 1),
hideEmpty=new_format))) hideEmpty=new_format)))

@ -4316,6 +4316,7 @@ def render_table(header_row, data, delim=False, extraGap=0, hideEmpty=False):
def get_max_lens(table): def get_max_lens(table):
return [max(len(compat_str(v)) for v in col) for col in zip(*table)] return [max(len(compat_str(v)) for v in col) for col in zip(*table)]
def filter_using_list(row, filterArray): def filter_using_list(row, filterArray):
return [col for (take, col) in zip(filterArray, row) if take] return [col for (take, col) in zip(filterArray, row) if take]
@ -4323,7 +4324,7 @@ def render_table(header_row, data, delim=False, extraGap=0, hideEmpty=False):
max_lens = get_max_lens(data) max_lens = get_max_lens(data)
header_row = filter_using_list(header_row, max_lens) header_row = filter_using_list(header_row, max_lens)
data = [filter_using_list(row, max_lens) for row in data] data = [filter_using_list(row, max_lens) for row in data]
table = [header_row] + data table = [header_row] + data
max_lens = get_max_lens(table) max_lens = get_max_lens(table)
if delim: if delim:
@ -5728,7 +5729,7 @@ def random_birthday(year_field, month_field, day_field):
} }
def format_field(obj, field, template='%s', ignore=(None,''), default='', func=None): def format_field(obj, field, template='%s', ignore=(None, ''), default='', func=None):
val = obj.get(field, default) val = obj.get(field, default)
if func and val not in ignore: if func and val not in ignore:
val = func(val) val = func(val)

Loading…
Cancel
Save