aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGino Lisignoli <glisignoli@gmail.com>2013-02-13 14:02:31 +1300
committerGino Lisignoli <glisignoli@gmail.com>2013-02-13 14:02:31 +1300
commit7311fef854632130af5edcae7f6762f0fedbaccb (patch)
tree8a925f224a4d08b028d890757757bc4609804499
parent906417c7c586218c5a61f9966ce7d67528f97b69 (diff)
Modified youtube-dl to write new lines with the --newline switch. This
enables easier process monitoring when being called with external scripts.
-rw-r--r--youtube_dl/FileDownloader.py5
-rw-r--r--youtube_dl/__init__.py3
2 files changed, 6 insertions, 2 deletions
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()))
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index abcb4f165..38b5fb163 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -202,6 +202,8 @@ def parseOpts():
verbosity.add_option('--get-format',
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)
verbosity.add_option('--no-progress',
action='store_true', dest='noprogress', help='do not print progress bar', default=False)
verbosity.add_option('--console-title',
@@ -210,7 +212,6 @@ def parseOpts():
verbosity.add_option('-v', '--verbose',
action='store_true', dest='verbose', help='print various debugging information', default=False)
-
filesystem.add_option('-t', '--title',
action='store_true', dest='usetitle', help='use title in file name', default=False)
filesystem.add_option('--id',