diff options
| author | John Hawkinson <jhawk@mit.edu> | 2016-10-08 09:27:24 -0400 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2018-03-24 16:34:55 +0700 |
| commit | 80aa24609415af36ac30caa392e85f8c20349535 (patch) | |
| tree | e701967cdf49ce2a8f6b157596a5c449eaa16a98 /youtube_dl/downloader/common.py | |
| parent | 0ff2c1ecb67b61e1410e1d0fe1966a7680e18947 (diff) | |
| download | youtube-dl-80aa24609415af36ac30caa392e85f8c20349535.tar.xz | |
[downloader/external] Fix download finalization when writing file to stdout (closes #10809)
An OSError or IOError generally indicates something a little more
wrong than a "simple" UnavailableVideoError, so print the actual
traceback that leads to the exception. Otherwise meaningful postmortem
debugging a bug report is essentially infeasible.
Diffstat (limited to 'youtube_dl/downloader/common.py')
| -rw-r--r-- | youtube_dl/downloader/common.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/youtube_dl/downloader/common.py b/youtube_dl/downloader/common.py index cc16bbb83..7062eee8b 100644 --- a/youtube_dl/downloader/common.py +++ b/youtube_dl/downloader/common.py @@ -249,12 +249,14 @@ class FileDownloader(object): if self.params.get('noprogress', False): self.to_screen('[download] Download completed') else: - s['_total_bytes_str'] = format_bytes(s['total_bytes']) + if s.get('total_bytes') is not None: + s['_total_bytes_str'] = format_bytes(s['total_bytes']) + msg_template = '100%% of %(_total_bytes_str)s' + else: + msg_template = 'Completed' if s.get('elapsed') is not None: s['_elapsed_str'] = self.format_seconds(s['elapsed']) - msg_template = '100%% of %(_total_bytes_str)s in %(_elapsed_str)s' - else: - msg_template = '100%% of %(_total_bytes_str)s' + msg_template += ' in %(_elapsed_str)s' self._report_progress_status( msg_template % s, is_last_line=True) |