X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Foptions.py;h=a018c1d711ffcb67997a15d4fdcec528cb7f99ba;hb=a221f22969843866ad85fd5cdf98160c79d99e9f;hp=7654d1a4ecbb4d357424fcdea68bbcaa51e80a9c;hpb=ff815fe65aab83db7e11251db5eafc76504adf05;p=youtube-dl diff --git a/youtube_dl/options.py b/youtube_dl/options.py index 7654d1a4e..a018c1d71 100644 --- a/youtube_dl/options.py +++ b/youtube_dl/options.py @@ -109,7 +109,7 @@ def parseOpts(overrideArguments=None): kw = { 'version': __version__, 'formatter': fmt, - 'usage': '%prog [options] url [url...]', + 'usage': '%prog [OPTIONS] URL [URL...]', 'conflict_handler': 'resolve', } @@ -484,10 +484,6 @@ def parseOpts(overrideArguments=None): filesystem.add_option( '--id', default=False, action='store_true', dest='useid', help='use only video ID in file name') - filesystem.add_option( - '-A', '--auto-number', - action='store_true', dest='autonumber', default=False, - help='number downloaded files starting from 00000') filesystem.add_option( '-o', '--output', dest='outtmpl', metavar='TEMPLATE', @@ -515,6 +511,10 @@ def parseOpts(overrideArguments=None): '--restrict-filenames', action='store_true', dest='restrictfilenames', default=False, help='Restrict filenames to only ASCII characters, and avoid "&" and spaces in filenames') + filesystem.add_option( + '-A', '--auto-number', + action='store_true', dest='autonumber', default=False, + help='[deprecated; use -o "%(autonumber)s-%(title)s.%(ext)s" ] number downloaded files starting from 00000') filesystem.add_option( '-t', '--title', action='store_true', dest='usetitle', default=False,