Ver Fonte

Modified youtube-dl to write new lines with the --newline switch. This
enables easier process monitoring when being called with external
scripts.

Gino Lisignoli há 12 anos atrás
pai
commit
7311fef854
2 ficheiros alterados com 6 adições e 2 exclusões
  1. 4 1
      youtube_dl/FileDownloader.py
  2. 2 1
      youtube_dl/__init__.py

+ 4 - 1
youtube_dl/FileDownloader.py

@@ -305,7 +305,10 @@ class FileDownloader(object):
         """Report download progress."""
         """Report download progress."""
         if self.params.get('noprogress', False):
         if self.params.get('noprogress', False):
             return
             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)
                 (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' %
         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()))
                 (percent_str.strip(), data_len_str.strip(), speed_str.strip(), eta_str.strip()))

+ 2 - 1
youtube_dl/__init__.py

@@ -202,6 +202,8 @@ def parseOpts():
     verbosity.add_option('--get-format',
     verbosity.add_option('--get-format',
             action='store_true', dest='getformat',
             action='store_true', dest='getformat',
             help='simulate, quiet but print output format', default=False)
             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',
     verbosity.add_option('--no-progress',
             action='store_true', dest='noprogress', help='do not print progress bar', default=False)
             action='store_true', dest='noprogress', help='do not print progress bar', default=False)
     verbosity.add_option('--console-title',
     verbosity.add_option('--console-title',
@@ -210,7 +212,6 @@ def parseOpts():
     verbosity.add_option('-v', '--verbose',
     verbosity.add_option('-v', '--verbose',
             action='store_true', dest='verbose', help='print various debugging information', default=False)
             action='store_true', dest='verbose', help='print various debugging information', default=False)
 
 
-
     filesystem.add_option('-t', '--title',
     filesystem.add_option('-t', '--title',
             action='store_true', dest='usetitle', help='use title in file name', default=False)
             action='store_true', dest='usetitle', help='use title in file name', default=False)
     filesystem.add_option('--id',
     filesystem.add_option('--id',