aliased --literal to --title

diff --git a/README.md b/README.md
index 1a96bd98d858ef11a790b5648157c3da1cb642db..9e307858c5994f4bb77754f985740dbaae76467c 100644 (file)
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ which means you can modify it, redistribute it or use it however you like.
 ## Filesystem Options:
     -t, --title              use title in file name
     --id                     use video ID in file name
-    -l, --literal            use literal title in file name
+    -l, --literal            [deprecated] alias of --title
     -A, --auto-number        number downloaded files starting from 00000
     -o, --output TEMPLATE    output filename template. Use %(stitle)s to get the
                              title, %(uploader)s for the uploader name,

diff --git a/youtube-dl.1 b/youtube-dl.1
index d4883ad2f6c9c31db0be549e27d8c712c8a42887..b13b0103c72270ce2768672680d27ed5dd09931f 100644 (file)
--- a/youtube-dl.1
+++ b/youtube-dl.1
@@ -49,7 +49,7 @@ redistribute it or use it however you like.
 \f[C]
 -t,\ --title\ \ \ \ \ \ \ \ \ \ \ \ \ \ use\ title\ in\ file\ name
 --id\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ use\ video\ ID\ in\ file\ name
--l,\ --literal\ \ \ \ \ \ \ \ \ \ \ \ use\ literal\ title\ in\ file\ name
+-l,\ --literal\ \ \ \ \ \ \ \ \ \ \ \ [deprecated]\ alias\ of\ --title
 -A,\ --auto-number\ \ \ \ \ \ \ \ number\ downloaded\ files\ starting\ from\ 00000
 -o,\ --output\ TEMPLATE\ \ \ \ output\ filename\ template.\ Use\ %(stitle)s\ to\ get\ the
 \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ title,\ %(uploader)s\ for\ the\ uploader\ name,

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index c5bc62dd542107d66282f67664bdb7a98a073426..0d3682718b554b93b603a091568fd81acd982ff4 100644 (file)
--- 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'),