From 7311fef854632130af5edcae7f6762f0fedbaccb Mon Sep 17 00:00:00 2001 From: Gino Lisignoli Date: Wed, 13 Feb 2013 14:02:31 +1300 Subject: Modified youtube-dl to write new lines with the --newline switch. This enables easier process monitoring when being called with external scripts. --- youtube_dl/FileDownloader.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'youtube_dl/FileDownloader.py') diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index 4f51ed8b0..ca047ba4c 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'\r[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())) -- cgit v1.2.3 From 1528d6642d327571c1cd92a681deb819c41b5d67 Mon Sep 17 00:00:00 2001 From: Gino Lisignoli Date: Wed, 13 Feb 2013 16:43:08 +1300 Subject: Forgot to remove \r --- youtube_dl/FileDownloader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'youtube_dl/FileDownloader.py') diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index ca047ba4c..7ad9d9a76 100644 --- a/youtube_dl/FileDownloader.py +++ b/youtube_dl/FileDownloader.py @@ -306,7 +306,7 @@ class FileDownloader(object): if self.params.get('noprogress', False): return if self.params.get('newline', True): - self.to_screen(u'\r[download] %s of %s at %s ETA %s' % + 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) -- cgit v1.2.3