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

Merge 76204accc9 into a2f2a46f6f

This commit is contained in:
xombiemp 2013-01-23 11:24:08 -08:00
parent a2f2a46f6f 76204accc9
commit bff6e6958e
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
speedtest-cli
View File

@ -202,11 +202,20 @@ def closestServers(client):
attrib = dict(server.attributes.items()) attrib = dict(server.attributes.items())
d = distance([float(client['lat']), float(client['lon'])], d = distance([float(client['lat']), float(client['lon'])],
[float(attrib.get('lat')), float(attrib.get('lon'))]) [float(attrib.get('lat')), float(attrib.get('lon'))])
servers[d] = attrib if d not in servers:
servers[d] = [attrib]
else:
servers[d].append(attrib)
closest = [] closest = []
for d in sorted(servers.keys())[0:4]: for d in sorted(servers.keys()):
closest.append(servers[d]) for s in servers[d]:
closest.append(s)
if(len(closest) == 5):
break
else:
continue
break
del servers del servers
del root del root
@ -235,8 +244,9 @@ def getBestServer(servers):
avg = round((cum / 3) * 1000000, 3) avg = round((cum / 3) * 1000000, 3)
results[avg] = server results[avg] = server
best = results[sorted(results.keys())[0]] fastest = sorted(results.keys())[0]
best['latency'] = avg best = results[fastest]
best['latency'] = fastest
return best return best
@ -247,6 +257,9 @@ def speedtest():
print 'Retrieving speedtest.net configuration...' print 'Retrieving speedtest.net configuration...'
config = getConfig() config = getConfig()
client = dict(config['client'].items())
print 'Testing IP: %(ip)s from ISP: %(isp)s' % client
print 'Retrieving speedtest.net server list...' print 'Retrieving speedtest.net server list...'
servers = closestServers(config['client']) servers = closestServers(config['client'])