R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-add format note existence checks

Browse Source
This commit is contained in:
AGSPhoenix 2014-04-28 19:11:49 -04:00
parent 71a64d362f
commit fe5e9b2174
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
youtube_dl/YoutubeDL.py
View File

@ -1149,10 +1149,14 @@ class YoutubeDL(object):
if fdict.get('tbr') is not None: if fdict.get('tbr') is not None:
res += '%5dk' % fdict['tbr'] res += '%5dk' % fdict['tbr']
if fdict.get('container') is not None: if fdict.get('container') is not None:
res += ', %s container' % fdict['container'] if res:
res += ', '
res += '%s container' % fdict['container']
if (fdict.get('vcodec') is not None and if (fdict.get('vcodec') is not None and
fdict.get('vcodec') != 'none'): fdict.get('vcodec') != 'none'):
res += ', ' + fdict['vcodec'] if res:
res += ', '
res += fdict['vcodec']
if fdict.get('vbr') is not None: if fdict.get('vbr') is not None:
res += '@' res += '@'
elif fdict.get('vbr') is not None and fdict.get('abr') is not None: elif fdict.get('vbr') is not None and fdict.get('abr') is not None:
@ -1160,18 +1164,24 @@ class YoutubeDL(object):
if fdict.get('vbr') is not None: if fdict.get('vbr') is not None:
res += '%4dk' % fdict['vbr'] res += '%4dk' % fdict['vbr']
if fdict.get('acodec') is not None: if fdict.get('acodec') is not None:
if res:
res += ', '
if fdict['acodec'] == 'none': if fdict['acodec'] == 'none':
res += ', video only' res += 'video only'
else: else:
res += ', %-5s' % fdict['acodec'] res += ', %-5s' % fdict['acodec']
elif fdict.get('abr') is not None: elif fdict.get('abr') is not None:
res += ', audio' if res:
res += ', '
res += 'audio'
if fdict.get('abr') is not None: if fdict.get('abr') is not None:
res += '@%3dk' % fdict['abr'] res += '@%3dk' % fdict['abr']
if fdict.get('asr') is not None: if fdict.get('asr') is not None:
res += ' (%5dHz)' % fdict['asr'] res += ' (%5dHz)' % fdict['asr']
if fdict.get('filesize') is not None: if fdict.get('filesize') is not None:
res += ', ' + format_bytes(fdict['filesize']) if res:
res += ', '
res += format_bytes(fdict['filesize'])
return res return res
def line(format, idlen=20): def line(format, idlen=20):