Przeglądaj źródła

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
Jaime Marquínez Ferrándiz 11 lat temu
rodzic
commit
dca02c80bc
1 zmienionych plików z 3 dodań i 3 usunięć
  1. 3 3
      youtube_dl/__init__.py

+ 3 - 3
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,