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

Merge aa927693f1 into 18408ee938

This commit is contained in:
Sir-Fancy 2014-02-26 08:12:57 -05:00
parent 18408ee938 aa927693f1
commit 38791ccc6b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
speedtest_cli.py
View File

@ -450,6 +450,7 @@ def speedtest():
parser.add_argument = parser.add_option
except AttributeError:
pass
parser.add_argument('-b', action='store_true', help='Use Bytes instead of Bits for speed.')
parser.add_argument('--share', action='store_true',
help='Generate and provide a URL to the speedtest.net '
'share results image')
@ -584,7 +585,10 @@ def speedtest():
dlspeed = downloadSpeed(urls, args.simple)
if not args.simple:
print_()
print_('Download: %0.2f Mbit/s' % ((dlspeed / 1000 / 1000) * 8))
if not args.b:
print_('Download: %0.2f Mbit/s' % ((dlspeed / 1000 / 1000) * 8) )
else:
print_('Download: %0.2f Mbytes/s' % (dlspeed / 1000 / 1000) )
sizesizes = [int(.25 * 1000 * 1000), int(.5 * 1000 * 1000)]
sizes = []
@ -596,8 +600,13 @@ def speedtest():
ulspeed = uploadSpeed(best['url'], sizes, args.simple)
if not args.simple:
print_()
print_('Upload: %0.2f Mbit/s' % ((ulspeed / 1000 / 1000) * 8))
if not args.b:
print_('Upload: %0.2f Mbit/s' % ((ulspeed / 1000 / 1000) * 8))
else:
print_('Upload: %0.2f Mbytes/s' % (ulspeed / 1000 / 1000))
if args.share and args.b:
print_('Cannot use Mbytes for share results image, defaulting to Mbits')
if args.share and args.mini:
print_('Cannot generate a speedtest.net share results image while '
'testing against a Speedtest Mini server')