mirror of
https://github.com/blackjack4494/yt-dlc.git
synced 2024-12-22 07:43:08 +00:00
Rename NOTE
in -F
to MORE INFO
since it's often confused to be the same as `format_note`
This commit is contained in:
parent
cca80fe611
commit
3f698246b2
1 changed files with 8 additions and 15 deletions
|
@ -3007,17 +3007,6 @@ class YoutubeDL(object):
|
||||||
res += '~' + format_bytes(fdict['filesize_approx'])
|
res += '~' + format_bytes(fdict['filesize_approx'])
|
||||||
return res
|
return res
|
||||||
|
|
||||||
def _format_note_table(self, f):
|
|
||||||
def join_fields(*vargs):
|
|
||||||
return ', '.join((val for val in vargs if val != ''))
|
|
||||||
|
|
||||||
return join_fields(
|
|
||||||
'UNSUPPORTED' if f.get('ext') in ('f4f', 'f4m') else '',
|
|
||||||
format_field(f, 'language', '[%s]'),
|
|
||||||
format_field(f, 'format_note'),
|
|
||||||
format_field(f, 'container', ignore=(None, f.get('ext'))),
|
|
||||||
format_field(f, 'asr', '%5dHz'))
|
|
||||||
|
|
||||||
def list_formats(self, info_dict):
|
def list_formats(self, info_dict):
|
||||||
formats = info_dict.get('formats', [info_dict])
|
formats = info_dict.get('formats', [info_dict])
|
||||||
new_format = (
|
new_format = (
|
||||||
|
@ -3040,11 +3029,15 @@ class YoutubeDL(object):
|
||||||
format_field(f, 'acodec', default='unknown').replace('none', ''),
|
format_field(f, 'acodec', default='unknown').replace('none', ''),
|
||||||
format_field(f, 'abr', '%3dk'),
|
format_field(f, 'abr', '%3dk'),
|
||||||
format_field(f, 'asr', '%5dHz'),
|
format_field(f, 'asr', '%5dHz'),
|
||||||
self._format_note_table(f)]
|
', '.join(filter(None, (
|
||||||
for f in formats
|
'UNSUPPORTED' if f.get('ext') in ('f4f', 'f4m') else '',
|
||||||
if f.get('preference') is None or f['preference'] >= -1000]
|
format_field(f, 'language', '[%s]'),
|
||||||
|
format_field(f, 'format_note'),
|
||||||
|
format_field(f, 'container', ignore=(None, f.get('ext'))),
|
||||||
|
format_field(f, 'asr', '%5dHz')))),
|
||||||
|
] for f in formats if f.get('preference') is None or f['preference'] >= -1000]
|
||||||
header_line = ['ID', 'EXT', 'RESOLUTION', 'FPS', '|', ' FILESIZE', ' TBR', 'PROTO',
|
header_line = ['ID', 'EXT', 'RESOLUTION', 'FPS', '|', ' FILESIZE', ' TBR', 'PROTO',
|
||||||
'|', 'VCODEC', ' VBR', 'ACODEC', ' ABR', ' ASR', 'NOTE']
|
'|', 'VCODEC', ' VBR', 'ACODEC', ' ABR', ' ASR', 'MORE INFO']
|
||||||
else:
|
else:
|
||||||
table = [
|
table = [
|
||||||
[
|
[
|
||||||
|
|
Loading…
Reference in a new issue