Correct --newline and give it a more meaningful title

diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index 7ad9d9a76ff6325f91f4f58215303c0390d1b0cb..0ac526389cef50ea37e657785a9f2af4d383feec 100644 (file)
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -305,10 +305,11 @@ class FileDownloader(object):
         """Report download progress."""
         if self.params.get('noprogress', False):
             return
-        if self.params.get('newline', True):
+        if self.params.get('progress_with_newline', False):
             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' %
+        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()))

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 035ab110cb30bfaf176ac8eaef9ae662ecd2aa3c..f05331644ba6322b84f20b9136e081771f3a1666 100644 (file)
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -203,7 +203,7 @@ def parseOpts():
             action='store_true', dest='getformat',
             help='simulate, quiet but print output format', default=False)
     verbosity.add_option('--newline',
-            action='store_true', dest='newline', help='output progress bar as new lines', default=False)
+            action='store_true', dest='progress_with_newline', help='output progress bar as new lines', default=False)
     verbosity.add_option('--no-progress',
             action='store_true', dest='noprogress', help='do not print progress bar', default=False)
     verbosity.add_option('--console-title',
@@ -439,6 +439,7 @@ def _real_main():
         'noresizebuffer': opts.noresizebuffer,
         'continuedl': opts.continue_dl,
         'noprogress': opts.noprogress,
+        'progress_with_newline': opts.progress_with_newline,
         'playliststart': opts.playliststart,
         'playlistend': opts.playlistend,
         'logtostderr': opts.outtmpl == '-',