New --id option for the old default filename pattern

diff --git a/README.md b/README.md
index 64a64c610df502cda227113640985bf17e6c2178..11f4e80adfb77b8f360d0af030721f2714d63135 100644 (file)
--- a/README.md
+++ b/README.md
@@ -36,6 +36,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
     -A, --auto-number        number downloaded files starting from 00000
     -o, --output TEMPLATE    output filename template. Use %(stitle)s to get the

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

diff --git a/youtube-dl.bash-completion b/youtube-dl.bash-completion
index 1eca2adf30cc5d5d6444e515755dce1e467bd2e3..76451a2b271db89de25de565fa203a64bc802620 100644 (file)
--- a/youtube-dl.bash-completion
+++ b/youtube-dl.bash-completion
@@ -3,7 +3,7 @@ __youtube-dl()
     local cur prev opts
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
-    opts="--all-formats --audio-format --audio-quality --auto-number --batch-file --console-title --continue --cookies --dump-user-agent --extract-audio --format --get-description --get-filename --get-format --get-thumbnail --get-title --get-url --help --ignore-errors --keep-video --list-extractors --list-formats --literal --match-title --max-downloads --max-quality --netrc --no-continue --no-mtime --no-overwrites --no-part --no-progress --output --password --playlist-end --playlist-start --prefer-free-formats --quiet --rate-limit --reject-title --retries --simulate --skip-download --srt-lang --title --update --user-agent --username --verbose --version --write-description --write-info-json --write-srt"
+    opts="--all-formats --audio-format --audio-quality --auto-number --batch-file --console-title --continue --cookies --dump-user-agent --extract-audio --format --get-description --get-filename --get-format --get-thumbnail --get-title --get-url --help --id --ignore-errors --keep-video --list-extractors --list-formats --literal --match-title --max-downloads --max-quality --netrc --no-continue --no-mtime --no-overwrites --no-part --no-progress --output --password --playlist-end --playlist-start --prefer-free-formats --quiet --rate-limit --reject-title --retries --simulate --skip-download --srt-lang --title --update --user-agent --username --verbose --version --write-description --write-info-json --write-srt"
 
     if [[ ${cur} == * ]] ; then
         COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index ad9a06c55a0cdf1279655e2a8be382cd6fe010d2..5f90e2bff983a0d767ab4b8c3058838759d04eb2 100644 (file)
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -265,6 +265,8 @@ def parseOpts():
 
        filesystem.add_option('-t', '--title',
                        action='store_true', dest='usetitle', help='use title in file name', default=False)
+       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)
        filesystem.add_option('-A', '--auto-number',
@@ -424,10 +426,14 @@ 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):
-               parser.error(u'using output template conflicts with using title, literal title or auto number')
+       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.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,6 +491,7 @@ def _real_main():
                        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'),
                'ignoreerrors': opts.ignoreerrors,