diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2014-04-30 10:02:03 +0200 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2014-04-30 10:02:08 +0200 |
commit | acd69589a54d03f60a018a298c74a4c8aef2abc2 (patch) | |
tree | 3b5bc9562ec450c4e89fafdf914740193c80b0b8 /youtube_dl/__init__.py | |
parent | b30b8698ea11e85079cc9e392cdf26f4e61671c4 (diff) |
[YoutubeDL] Do not require default output template to be set
Diffstat (limited to 'youtube_dl/__init__.py')
-rw-r--r-- | youtube_dl/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 42ef13786..1d8cf9a09 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -72,6 +72,7 @@ from .utils import ( compat_getpass, compat_print, DateRange, + DEFAULT_OUTTMPL, decodeOption, get_term_width, DownloadError, @@ -705,7 +706,7 @@ def _real_main(argv=None): or (opts.usetitle 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'%(title)s-%(id)s.%(ext)s') + or DEFAULT_OUTTMPL) if not os.path.splitext(outtmpl)[1] and opts.extractaudio: parser.error(u'Cannot download a video and extract audio into the same' u' file! Use "{0}.%(ext)s" instead of "{0}" as the output' |