diff options
Diffstat (limited to 'youtube_dl/__init__.py')
| -rw-r--r-- | youtube_dl/__init__.py | 15 | 
1 files changed, 7 insertions, 8 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 431460c57..696e54f49 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -28,6 +28,8 @@ __authors__  = (      'Axel Noack',      'Albert Kim',      'Pierre Rudloff', +    'Huarong Huo', +    'Ismael Mejía',  )  __license__ = 'Public Domain' @@ -192,7 +194,7 @@ def parseOpts(overrideArguments=None):      video_format.add_option('-f', '--format',              action='store', dest='format', metavar='FORMAT', -            help='video format code, specifiy the order of preference using slashes: "-f 22/17/18"') +            help='video format code, specifiy the order of preference using slashes: "-f 22/17/18". "-f mp4" and "-f flv" are also supported')      video_format.add_option('--all-formats',              action='store_const', dest='format', help='download all available video formats', const='all')      video_format.add_option('--prefer-free-formats', @@ -204,13 +206,10 @@ def parseOpts(overrideArguments=None):      subtitles.add_option('--write-sub', '--write-srt',              action='store_true', dest='writesubtitles', -            help='write subtitle file (currently youtube only)', default=False) +            help='write subtitle file', default=False)      subtitles.add_option('--write-auto-sub', '--write-automatic-sub',              action='store_true', dest='writeautomaticsub', -            help='write automatic subtitle file (currently youtube only)', default=False) -    subtitles.add_option('--only-sub', -            action='store_true', dest='skip_download', -            help='[deprecated] alias of --skip-download', default=False) +            help='write automatic subtitle file (youtube only)', default=False)      subtitles.add_option('--all-subs',              action='store_true', dest='allsubtitles',              help='downloads all the available subtitles of the video', default=False) @@ -221,7 +220,7 @@ def parseOpts(overrideArguments=None):              action='store', dest='subtitlesformat', metavar='FORMAT',              help='subtitle format (default=srt) ([sbv/vtt] youtube only)', default='srt')      subtitles.add_option('--sub-lang', '--sub-langs', '--srt-lang', -            action='callback', dest='subtitleslang', metavar='LANGS', type='str', +            action='callback', dest='subtitleslangs', metavar='LANGS', type='str',              default=[], callback=_comma_separated_values_options_callback,              help='languages of the subtitles to download (optional) separated by commas, use IETF language tags like \'en,pt\'') @@ -592,7 +591,7 @@ def _real_main(argv=None):          'allsubtitles': opts.allsubtitles,          'listsubtitles': opts.listsubtitles,          'subtitlesformat': opts.subtitlesformat, -        'subtitleslangs': opts.subtitleslang, +        'subtitleslangs': opts.subtitleslangs,          'matchtitle': decodeOption(opts.matchtitle),          'rejecttitle': decodeOption(opts.rejecttitle),          'max_downloads': opts.max_downloads,  | 
