From: Jaime Marquínez Ferrándiz Date: Sun, 15 Dec 2013 10:42:38 +0000 (+0100) Subject: Fix detection of the extension if the 'extractaudio' is given and improve the error... X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=dca02c80bc5c370bb3b15c9343d255dd124d2a93;p=youtube-dl Fix detection of the extension if the 'extractaudio' is given and improve the error message (#1969) Using 'foo.mp4' shouldn't raise an error. If 'foo' is given suggest using 'foo.%(ext)s' for the template --- diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 3e82cd637..55e59814b 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -604,10 +604,10 @@ def _real_main(argv=None): 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') - if '%(ext)s' not in outtmpl and opts.extractaudio: + 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 "%%(ext)s" instead of %r' % - determine_ext(outtmpl, u'')) + u' file! Use "{0}.%(ext)s" instead of "{0}" as the output' + u' template'.format(outtmpl)) ydl_opts = { 'usenetrc': opts.usenetrc,