From 5717d91ab724a843e0cdbda6e9a0bc6e8c458856 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 18 Feb 2013 18:52:06 +0100
Subject: [PATCH] Correct --newline and give it a more meaningful title

---
 youtube_dl/FileDownloader.py | 5 +++--
 youtube_dl/__init__.py       | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index 7ad9d9a76..0ac526389 100644
--- 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 035ab110c..f05331644 100644
--- 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 == '-',