diff options
| author | Filippo Valsorda <filippo.valsorda@gmail.com> | 2012-11-25 20:28:49 +0100 |
|---|---|---|
| committer | Filippo Valsorda <filippo.valsorda@gmail.com> | 2012-11-25 20:28:49 +0100 |
| commit | baec15387ce296c6a12fabdff9a1e75d421f798f (patch) | |
| tree | f8f0a1430020e709e5a893406d2495357167bf0b /youtube_dl | |
| parent | 5002aea371913e5094ba4cd6faba82a44be84f5e (diff) | |
| download | youtube-dl-baec15387ce296c6a12fabdff9a1e75d421f798f.tar.xz | |
aliased --literal to --title
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/__init__.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index c5bc62dd5..0d3682718 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -268,7 +268,7 @@ def parseOpts(): filesystem.add_option('--id', action='store_true', dest='useid', help='use video ID in file name', default=False) filesystem.add_option('-l', '--literal', - action='store_true', dest='useliteral', help='use literal title in file name', default=False) + action='store_true', dest='usetitle', help='[deprecated] alias of --title', default=False) filesystem.add_option('-A', '--auto-number', action='store_true', dest='autonumber', help='number downloaded files starting from 00000', default=False) @@ -426,14 +426,10 @@ def _real_main(): parser.error(u'using .netrc conflicts with giving username/password') if opts.password is not None and opts.username is None: parser.error(u'account username missing') - if opts.outtmpl is not None and (opts.useliteral or opts.usetitle or opts.autonumber or opts.useid): - parser.error(u'using output template conflicts with using title, literal title, video ID or auto number') - if opts.usetitle and opts.useliteral: - parser.error(u'using title conflicts with using literal title') + if opts.outtmpl is not None and (opts.usetitle or opts.autonumber or opts.useid): + parser.error(u'using output template conflicts with using title, video ID or auto number') if opts.usetitle and opts.useid: parser.error(u'using title conflicts with using video ID') - if opts.useliteral and opts.useid: - parser.error(u'using literal title conflicts with using video ID') if opts.username is not None and opts.password is None: opts.password = getpass.getpass(u'Type account password and press return:') if opts.ratelimit is not None: @@ -485,12 +481,9 @@ def _real_main(): 'listformats': opts.listformats, 'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(preferredencoding())) or (opts.format == '-1' and opts.usetitle and u'%(stitle)s-%(id)s-%(format)s.%(ext)s') - or (opts.format == '-1' and opts.useliteral and u'%(title)s-%(id)s-%(format)s.%(ext)s') or (opts.format == '-1' and u'%(id)s-%(format)s.%(ext)s') or (opts.usetitle and opts.autonumber and u'%(autonumber)s-%(stitle)s-%(id)s.%(ext)s') - or (opts.useliteral and opts.autonumber and u'%(autonumber)s-%(title)s-%(id)s.%(ext)s') or (opts.usetitle and u'%(stitle)s-%(id)s.%(ext)s') - or (opts.useliteral and u'%(title)s-%(id)s.%(ext)s') or (opts.useid and u'%(id)s.%(ext)s') or (opts.autonumber and u'%(autonumber)s-%(id)s.%(ext)s') or u'%(id)s.%(ext)s'), |