]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Only skip download if files exists; convert audio
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 16 Dec 2011 22:28:43 +0000 (23:28 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 16 Dec 2011 22:33:46 +0000 (23:33 +0100)
youtube_dl/__init__.py

index c2511e8644ed5c7ab65c69697deec68c9387c61d..d02178cc3f8dc3f72448a91207ea364e83f537b2 100755 (executable)
@@ -759,10 +759,6 @@ class FileDownloader(object):
                if filename is None:
                        return
 
-               if self.params.get('nooverwrites', False) and os.path.exists(filename):
-                       self.to_stderr(u'WARNING: file exists and will be skipped')
-                       return
-
                try:
                        dn = os.path.dirname(filename)
                        if dn != '' and not os.path.exists(dn):
@@ -804,16 +800,19 @@ class FileDownloader(object):
                                return
 
                if not self.params.get('skip_download', False):
-                       try:
-                               success = self._do_download(filename, info_dict)
-                       except (OSError, IOError), err:
-                               raise UnavailableVideoError
-                       except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-                               self.trouble(u'ERROR: unable to download video data: %s' % str(err))
-                               return
-                       except (ContentTooShortError, ), err:
-                               self.trouble(u'ERROR: content too short (expected %s bytes and served %s)' % (err.expected, err.downloaded))
-                               return
+                       if self.params.get('nooverwrites', False) and os.path.exists(filename):
+                               success = True
+                       else:
+                               try:
+                                       success = self._do_download(filename, info_dict)
+                               except (OSError, IOError), err:
+                                       raise UnavailableVideoError
+                               except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+                                       self.trouble(u'ERROR: unable to download video data: %s' % str(err))
+                                       return
+                               except (ContentTooShortError, ), err:
+                                       self.trouble(u'ERROR: content too short (expected %s bytes and served %s)' % (err.expected, err.downloaded))
+                                       return
        
                        if success:
                                try: