X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2F__init__.py;h=74375175dd1ebca987de37ceef7af30b34ca5de0;hb=320e26a0af46dcefd53ba06656c986def933bc6b;hp=f60fb841e35e50eb576274f46ce7d776cb8c7ccf;hpb=71f37e90ef330f056abe456c93d59cee23765ede;p=youtube-dl diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index f60fb841e..74375175d 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -165,7 +165,8 @@ def parseOpts(overrideArguments=None): video_format.add_option('-f', '--format', - action='store', dest='format', metavar='FORMAT', help='video format code') + action='store', dest='format', metavar='FORMAT', + help='video format code, specifiy the order of preference using slashes: "-f 22/17/18"') 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', @@ -315,11 +316,10 @@ def parseOpts(overrideArguments=None): commandLineConf = sys.argv[1:] argv = systemConf + userConf + commandLineConf opts, args = parser.parse_args(argv) - - if opts.verbose: - print(u'[debug] System config: ' + repr(systemConf)) - print(u'[debug] User config: ' + repr(userConf)) - print(u'[debug] Command-line args: ' + repr(commandLineConf)) + if opts.verbose: + print(u'[debug] System config: ' + repr(systemConf)) + print(u'[debug] User config: ' + repr(userConf)) + print(u'[debug] Command-line args: ' + repr(commandLineConf)) return parser, opts, args