projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Abort download in case of error writing file data to disk
[youtube-dl]
/
youtube-dl
diff --git
a/youtube-dl
b/youtube-dl
index d5469495404ca1ca9640a0a619628c511edf4f59..fb231ae400d7e32cb70407395d48c940564bcf76 100755
(executable)
--- a/
youtube-dl
+++ b/
youtube-dl
@@
-353,7
+353,7
@@
class FileDownloader(object):
(percent_str, data_len_str, speed_str, eta_str), skip_eol=True)
def report_resuming_byte(self, resume_len):
(percent_str, data_len_str, speed_str, eta_str), skip_eol=True)
def report_resuming_byte(self, resume_len):
- """Report attem
tp
to resume at given byte."""
+ """Report attem
pt
to resume at given byte."""
self.to_stdout(u'[download] Resuming download at byte %s' % resume_len)
def report_retry(self, count, retries):
self.to_stdout(u'[download] Resuming download at byte %s' % resume_len)
def report_retry(self, count, retries):
@@
-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:
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
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:
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
block_size = self.best_block_size(after - before, data_block_len)
# Progress message