[downloader/common] Improve progress reporting when no total bytes available

This commit is contained in:
Sergey M․ 2018-03-24 16:27:36 +07:00
parent 80aa246094
commit 2ea212628e
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D

View file

@ -249,11 +249,10 @@ class FileDownloader(object):
if self.params.get('noprogress', False): if self.params.get('noprogress', False):
self.to_screen('[download] Download completed') self.to_screen('[download] Download completed')
else: else:
msg_template = '100%%'
if s.get('total_bytes') is not None: if s.get('total_bytes') is not None:
s['_total_bytes_str'] = format_bytes(s['total_bytes']) s['_total_bytes_str'] = format_bytes(s['total_bytes'])
msg_template = '100%% of %(_total_bytes_str)s' msg_template += ' of %(_total_bytes_str)s'
else:
msg_template = 'Completed'
if s.get('elapsed') is not None: if s.get('elapsed') is not None:
s['_elapsed_str'] = self.format_seconds(s['elapsed']) s['_elapsed_str'] = self.format_seconds(s['elapsed'])
msg_template += ' in %(_elapsed_str)s' msg_template += ' in %(_elapsed_str)s'