walkero
/
speedtest-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge 57a1ba8390 into c22a41ccaf

This commit is contained in:
Binyamin Sharet 2013-07-28 15:27:35 -07:00
parent c22a41ccaf 57a1ba8390
commit dd6474fce3
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
speedtest-cli
View File

@ -160,6 +160,14 @@ class FileGetter(threading.Thread):
self.result = 0
def show_progress( count, total ):
if not quiet:
status = "[ %d out of %d files ]" % ( count, total )
sys.stdout.write( status )
if ( count < total ):
sys.stdout.write( '\b' * len( status ) )
sys.stdout.flush( )
def downloadSpeed(files, quiet=False):
start = time.time()
@ -168,17 +176,16 @@ def downloadSpeed(files, quiet=False):
thread = FileGetter(file, start)
thread.start()
q.put(thread, True)
if not quiet:
sys.stdout.write('.')
sys.stdout.flush()
finished = []
def consumer(q, total_files):
show_progress( len( finished ), total_files )
while len(finished) < total_files:
thread = q.get(True)
thread.join()
finished.append(thread.result)
show_progress( len( finished ), total_files )
thread.result = 0
q = Queue(6)
@ -226,17 +233,16 @@ def uploadSpeed(url, sizes, quiet=False):
thread = FilePutter(url, start, size)
thread.start()
q.put(thread, True)
if not quiet:
sys.stdout.write('.')
sys.stdout.flush()
finished = []
def consumer(q, total_sizes):
show_progress( len( finished ), total_sizes )
while len(finished) < total_sizes:
thread = q.get(True)
thread.join()
finished.append(thread.result)
show_progress( len( finished ), total_sizes )
thread.result = 0
q = Queue(6)