Abort download in case of error writing file data to disk

[youtube-dl] / youtube-dl

diff --git a/youtube-dl b/youtube-dl
index b41b57ea8aec88793b6143c5c3180a19ea901c09..fb231ae400d7e32cb70407395d48c940564bcf76 100755 (executable)
--- a/youtube-dl
+++ b/youtube-dl
@@ -404,7 +404,8 @@ class FileDownloader(object):
                        template_dict['ord'] = unicode('%05d' % self._num_downloads)
                        filename = self.params['outtmpl'] % template_dict
                except (ValueError, KeyError), err:
-                       self.trouble('ERROR: invalid output template or system charset: %s' % str(err))
+                       self.trouble(u'ERROR: invalid system charset or erroneous output template')
+                       return
                if self.params.get('nooverwrites', False) and os.path.exists(filename):
                        self.to_stderr(u'WARNING: file exists: %s; skipping' % filename)
                        return
@@ -593,7 +594,8 @@ class FileDownloader(object):
                        try:
                                stream.write(data_block)
                        except (IOError, OSError), err:
-                               self.trouble('\nERROR: unable to write data: %s' % str(err))
+                               self.trouble(u'\nERROR: unable to write data: %s' % str(err))
+                               return False
                        block_size = self.best_block_size(after - before, data_block_len)
 
                        # Progress message