aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/FileDownloader.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-02-18 18:47:35 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2013-02-18 18:47:35 +0100
commit79eb0287ab34767e72e77d612775789ff9da0422 (patch)
tree78c92c62951aca26edbb3ac11ec4c098cc6a7270 /youtube_dl/FileDownloader.py
parent58994225bcd6626c2ed2bbf441577b0beaa4bf3c (diff)
parent355fc8e9443b991819b5ebf95464894bd131126c (diff)
Merge remote-tracking branch 'glisignoli/master'
Diffstat (limited to 'youtube_dl/FileDownloader.py')
-rw-r--r--youtube_dl/FileDownloader.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index 4f51ed8b0..7ad9d9a76 100644
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -305,7 +305,10 @@ class FileDownloader(object):
"""Report download progress."""
if self.params.get('noprogress', False):
return
- self.to_screen(u'\r[download] %s of %s at %s ETA %s' %
+ if self.params.get('newline', True):
+ self.to_screen(u'[download] %s of %s at %s ETA %s' %
+ (percent_str, data_len_str, speed_str, eta_str))
+ else: self.to_screen(u'\r[download] %s of %s at %s ETA %s' %
(percent_str, data_len_str, speed_str, eta_str), skip_eol=True)
self.to_cons_title(u'youtube-dl - %s of %s at %s ETA %s' %
(percent_str.strip(), data_len_str.strip(), speed_str.strip(), eta_str.strip()))