added progress bar, and function to read size in human readable format, updated call to print_status function

pytube/models.py

@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 from os.path import normpath, isfile
 from os import remove
+from time import clock
 try:
     from urllib2 import urlopen
 except ImportError:
@@ -60,6 +61,7 @@ class Video(object):
         file_size = int(meta_data.get("Content-Length") or
                 meta_data.get("content-length"))
         self._bytes_received = 0
+        start = clock()
         try:
             with open(fullpath, 'wb') as dst_file:
                 # Print downloading message
@@ -76,7 +78,7 @@ class Video(object):
                     self._bytes_received += len(self._buffer)
                     dst_file.write(self._buffer)
                     if on_progress:
-                        on_progress(self._bytes_received, file_size)
+                        on_progress(self._bytes_received, file_size, start)
 
         # Catch possible exceptions occurring during download
         except IOError:

pytube/utils.py

@@ -1,5 +1,6 @@
 import re
 from sys import stdout
+from time import clock
 
 def safe_filename(text, max_length=200):
     """
@@ -27,8 +28,38 @@ def safe_filename(text, max_length=200):
     filename = blacklist.sub('', text)
     return truncate(filename)
 
+def sizeof(bytes): 
+    """ Takes the size of file or folder in bytes and 
+        returns size formatted in kb, MB, GB, TB or PB. 
 
-def print_status(progress, file_size):
+        Args:
+            bytes(int): size of the file in bytes
+        Return:
+            (str): containing size with formatting.
+    """
+    alternative = [ 
+        (1024 ** 5, ' PB'), 
+        (1024 ** 4, ' TB'), 
+        (1024 ** 3, ' GB'), 
+        (1024 ** 2, ' MB'), 
+        (1024 ** 1, ' KB'), 
+        (1024 ** 0, (' byte', ' bytes')), 
+    ] 
+ 
+    for factor, suffix in alternative: 
+        if bytes >= factor: 
+            break
+    amount = int(bytes/factor) 
+    if isinstance(suffix, tuple): 
+        singular, multiple = suffix 
+        if amount == 1: 
+            suffix = singular 
+        else: 
+            suffix = multiple 
+    return "%s%s" % (str(amount), suffix)
+
+
+def print_status(progress, file_size, start):
     """
     This function - when passed as `on_progress` to `Video.download` - prints
     out the current download progress.
@@ -36,10 +67,12 @@ def print_status(progress, file_size):
     Arguments:
     progress -- The lenght of the currently downloaded bytes.
     file_size -- The total size of the video.
+    start -- time when started
     """
-
-    percent = progress * 100. / file_size
-    status = r"{0:10d}  [{1:3.2f}%]".format(progress, percent)
-    status = status + chr(8) * (len(status) + 1)
-    stdout.write('%s\r' % status)
+    done = int(50 * progress / int(file_size))
+    percentDone = int(progress) * 100. / file_size
+    speed = sizeof(progress//(clock() - start))
+    bar = '=' * done
+    die = ' ' * (50-done)
+    stdout.write("\r[%s%s][%3.2f%%] %s of %s at %s/s   " % (bar, die, percentDone, sizeof(progress), sizeof(file_size), speed))
     stdout.flush()

scripts/pytubectl

@@ -69,3 +69,6 @@ def _main():
     except KeyboardInterrupt:
         print "Download interrupted."
         sys.exit(1)
+
+if __name__ == '__main__':
+    _main()