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

No need to retrieve/select server info for mini

This commit is contained in:
Peter Dave Hello 2015-09-22 15:28:41 +08:00
parent 7b09d8759f
commit 7fc663f09f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
speedtest_cli.py
View File

@ -617,7 +617,7 @@ def speedtest():
if args.secure: if args.secure:
scheme = 'https' scheme = 'https'
if not args.simple: if not args.simple and not args.mini:
print_('Retrieving speedtest.net configuration...') print_('Retrieving speedtest.net configuration...')
try: try:
config = getConfig() config = getConfig()
@ -625,7 +625,7 @@ def speedtest():
print_('Cannot retrieve speedtest configuration') print_('Cannot retrieve speedtest configuration')
sys.exit(1) sys.exit(1)
if not args.simple: if not args.simple and not args.mini:
print_('Retrieving speedtest.net server list...') print_('Retrieving speedtest.net server list...')
if args.list or args.server: if args.list or args.server:
servers = closestServers(config['client'], True) servers = closestServers(config['client'], True)
@ -698,11 +698,11 @@ def speedtest():
except: except:
best = servers[0] best = servers[0]
else: else:
if not args.simple: if not args.simple and not args.mini:
print_('Selecting best server based on latency...') print_('Selecting best server based on latency...')
best = getBestServer(servers) best = getBestServer(servers)
if not args.simple: if not args.simple and not args.mini:
print_(('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: ' print_(('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: '
'%(latency)s ms' % best).encode('utf-8', 'ignore')) '%(latency)s ms' % best).encode('utf-8', 'ignore'))
else: else: