New output format string version

This commit is contained in:
cousteau 2015-08-11 03:55:28 +02:00
parent 55478cfb39
commit e45665c912

View File

@ -575,22 +575,24 @@ def parseOpts(overrideArguments=None):
filesystem.add_option( filesystem.add_option(
'-o', '--output', '-o', '--output',
dest='outtmpl', metavar='TEMPLATE', dest='outtmpl', metavar='TEMPLATE',
help=('Output filename template. Use %(title)s to get the title, ' help=('Output filename template. Use {title} to get the title, '
'%(uploader)s for the uploader name, %(uploader_id)s for the uploader nickname if different, ' '{uploader} for the uploader name, {uploader_id} for the uploader nickname if different, '
'%(autonumber)s to get an automatically incremented number, ' '{autonumber} to get an automatically incremented number, '
'%(ext)s for the filename extension, ' '{ext} for the filename extension, '
'%(format)s for the format description (like "22 - 1280x720" or "HD"), ' '{format} for the format description (like "22 - 1280x720" or "HD"), '
'%(format_id)s for the unique id of the format (like YouTube\'s itags: "137"), ' '{format_id} for the unique id of the format (like YouTube\'s itags: "137"), '
'%(upload_date)s for the upload date (YYYYMMDD), ' '{upload_date} for the upload date (YYYYMMDD), '
'%(extractor)s for the provider (youtube, metacafe, etc), ' '{extractor} for the provider (youtube, metacafe, etc), '
'%(id)s for the video id, ' '{id} for the video id, '
'%(playlist_title)s, %(playlist_id)s, or %(playlist)s (=title if present, ID otherwise) for the playlist the video is in, ' '{playlist_title}, {playlist_id}, or {playlist} (=title if present, ID otherwise) for the playlist the video is in, '
'%(playlist_index)s for the position in the playlist. ' '{playlist_index} for the position in the playlist, '
'%(height)s and %(width)s for the width and height of the video format. ' '{height} and {width} for the width and height of the video format, '
'%(resolution)s for a textual description of the resolution of the video format. ' '{resolution} for a textual description of the resolution of the video format, '
'%% for a literal percent. ' '{{ }} %% for literal braces and percent. '
'The legacy form %(title)s is also supported with the same meaning as {title}, '
'but this may change in a future. '
'Use - to output to stdout. Can also be used to download to a different directory, ' 'Use - to output to stdout. Can also be used to download to a different directory, '
'for example with -o \'/my/downloads/%(uploader)s/%(title)s-%(id)s.%(ext)s\' .')) 'for example with -o \'/my/downloads/{uploader}/{title}-{id}.{ext}\' .'))
filesystem.add_option( filesystem.add_option(
'--autonumber-size', '--autonumber-size',
dest='autonumber_size', metavar='NUMBER', dest='autonumber_size', metavar='NUMBER',