public_git
/
speedtest-cli
mirror of https://github.com/sivel/speedtest-cli.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

pep8 formatting changes

This commit is contained in:
Matt Martz 2013-01-07 13:01:14 -06:00
parent ef4d483b94
commit 3a2260d6af
2 changed files with 431 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
speedtest-cli
View File

@ -37,9 +37,10 @@ def distance(origin, destination):
dlat = math.radians(lat2-lat1) dlat = math.radians(lat2-lat1)
dlon = math.radians(lon2-lon1) dlon = math.radians(lon2-lon1)
a = math.sin(dlat/2) * math.sin(dlat/2) + math.cos(math.radians(lat1)) \ a = (math.sin(dlat / 2) * math.sin(dlat / 2) + math.cos(math.radians(lat1))
* math.cos(math.radians(lat2)) * math.sin(dlon/2) * math.sin(dlon/2) * math.cos(math.radians(lat2)) * math.sin(dlon / 2)
c = 2 * math.atan2(math.sqrt(a), math.sqrt(1-a)) * math.sin(dlon / 2))
c = 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a))
d = radius * c d = radius * c
return d return d
@ -57,7 +58,7 @@ class FileGetter(threading.Thread):
def run(self): def run(self):
try: try:
if ( time.time() - self.starttime ) <= 10: if (time.time() - self.starttime) <= 10:
f = urllib.urlopen(self.url) f = urllib.urlopen(self.url)
contents = f.read() contents = f.read()
f.close() f.close()
@ -70,6 +71,7 @@ class FileGetter(threading.Thread):
def downloadSpeed(files): def downloadSpeed(files):
start = time.time() start = time.time()
def producer(q, files): def producer(q, files):
for file in files: for file in files:
thread = FileGetter(file, start) thread = FileGetter(file, start)
@ -79,6 +81,7 @@ def downloadSpeed(files):
sys.stdout.flush() sys.stdout.flush()
finished = [] finished = []
def consumer(q, total_files): def consumer(q, total_files):
while len(finished) < total_files: while len(finished) < total_files:
thread = q.get(True) thread = q.get(True)
@ -109,7 +112,7 @@ class FilePutter(threading.Thread):
def run(self): def run(self):
try: try:
if ( time.time() - self.starttime ) <= 10: if (time.time() - self.starttime) <= 10:
f = urllib.urlopen(self.url, self.data) f = urllib.urlopen(self.url, self.data)
contents = f.read() contents = f.read()
f.close() f.close()
@ -122,6 +125,7 @@ class FilePutter(threading.Thread):
def uploadSpeed(url, sizes): def uploadSpeed(url, sizes):
start = time.time() start = time.time()
def producer(q, sizes): def producer(q, sizes):
for size in sizes: for size in sizes:
thread = FilePutter(url, start, size) thread = FilePutter(url, start, size)
@ -131,6 +135,7 @@ def uploadSpeed(url, sizes):
sys.stdout.flush() sys.stdout.flush()
finished = [] finished = []
def consumer(q, total_sizes): def consumer(q, total_sizes):
while len(finished) < total_sizes: while len(finished) < total_sizes:
thread = q.get(True) thread = q.get(True)
@ -149,7 +154,9 @@ def uploadSpeed(url, sizes):
def getConfig(): def getConfig():
"""Download the speedtest.net configuration and return only the data we are interested in""" """Download the speedtest.net configuration and return only the data
we are interested in
"""
uh = urllib.urlopen('http://www.speedtest.net/speedtest-config.php') uh = urllib.urlopen('http://www.speedtest.net/speedtest-config.php')
configxml = uh.read() configxml = uh.read()
@ -161,13 +168,14 @@ def getConfig():
'client': root.find('client').attrib, 'client': root.find('client').attrib,
'times': root.find('times').attrib, 'times': root.find('times').attrib,
'download': root.find('download').attrib, 'download': root.find('download').attrib,
'upload': root.find('upload').attrib 'upload': root.find('upload').attrib}
}
return config return config
def closestServers(client): def closestServers(client):
"""Determine the 5 closest speedtest.net servers based on geographic distance""" """Determine the 5 closest speedtest.net servers based on geographic
distance
"""
uh = urllib.urlopen('http://speedtest.net/speedtest-servers.php') uh = urllib.urlopen('http://speedtest.net/speedtest-servers.php')
serversxml = uh.read() serversxml = uh.read()
@ -177,7 +185,8 @@ def closestServers(client):
root = ET.fromstring(serversxml) root = ET.fromstring(serversxml)
servers = {} servers = {}
for server in root[0]: for server in root[0]:
d = distance([float(client['lat']), float(client['lon'])], [float(server.get('lat')), float(server.get('lon'))]) d = distance([float(client['lat']), float(client['lon'])],
[float(server.get('lat')), float(server.get('lon'))])
servers[d] = server.attrib servers[d] = server.attrib
closest = [] closest = []
@ -190,13 +199,15 @@ def closestServers(client):
def getBestServer(servers): def getBestServer(servers):
"""Perform a speedtest.net "ping" to determine which speedtest.net server has the lowest latency""" """Perform a speedtest.net "ping" to determine which speedtest.net
server has the lowest latency
"""
results = {} results = {}
for server in servers: for server in servers:
cum = 0 cum = 0
url = os.path.dirname(server['url']) url = os.path.dirname(server['url'])
for i in xrange(0,3): for i in xrange(0, 3):
uh = urllib.urlopen('%s/latency.txt' % url) uh = urllib.urlopen('%s/latency.txt' % url)
start = time.time() start = time.time()
text = uh.read().strip() text = uh.read().strip()
@ -206,7 +217,7 @@ def getBestServer(servers):
else: else:
cum += 3600 cum += 3600
uh.close() uh.close()
avg = round((cum/3)*1000000,3) avg = round((cum / 3) * 1000000, 3)
results[avg] = server results[avg] = server
best = results[sorted(results.keys())[0]] best = results[sorted(results.keys())[0]]
@ -231,24 +242,25 @@ def speedtest():
sizes = [350, 500, 750, 1000, 1500, 2000, 2500, 3000, 3500, 4000] sizes = [350, 500, 750, 1000, 1500, 2000, 2500, 3000, 3500, 4000]
urls = [] urls = []
for size in sizes: for size in sizes:
for i in xrange(0,4): for i in xrange(0, 4):
urls.append('%s/random%sx%s.jpg' % (os.path.dirname(best['url']), size, size)) urls.append('%s/random%sx%s.jpg' %
(os.path.dirname(best['url']), size, size))
print 'Testing download speed', print 'Testing download speed',
dlspeed = downloadSpeed(urls) dlspeed = downloadSpeed(urls)
print '\nDownload: %s Mbit/s' % round((dlspeed/1024/1024)*8,2) print '\nDownload: %s Mbit/s' % round((dlspeed / 1024 / 1024) * 8, 2)
sizesizes = [int(.25*1024*1024), int(.5*1024*1024)] sizesizes = [int(.25 * 1024 * 1024), int(.5 * 1024 * 1024)]
sizes = [] sizes = []
for size in sizesizes: for size in sizesizes:
for i in xrange(0,25): for i in xrange(0, 25):
sizes.append(size) sizes.append(size)
print 'Testing upload speed', print 'Testing upload speed',
ulspeed = uploadSpeed(best['url'], sizes) ulspeed = uploadSpeed(best['url'], sizes)
print '\nUpload speed: %s Mbit/s' % round((ulspeed/1024/1024)*8,2) print '\nUpload speed: %s Mbit/s' % round((ulspeed / 1024 / 1024) * 8, 2)
dlspeedk = int(round((dlspeed/1024)*8, 0)) dlspeedk = int(round((dlspeed / 1024) * 8, 0))
ping = int(round(best['latency'], 0)) ping = int(round(best['latency'], 0))
ulspeedk = int(round((ulspeed/1024)*8, 0)) ulspeedk = int(round((ulspeed / 1024) * 8, 0))
apiData = [ apiData = [
'download=%s' % dlspeedk, 'download=%s' % dlspeedk,
@ -259,10 +271,12 @@ def speedtest():
'recommendedserverid=%s' % best['id'], 'recommendedserverid=%s' % best['id'],
'accuracy=%s' % 1, 'accuracy=%s' % 1,
'serverid=%s' % best['id'], 'serverid=%s' % best['id'],
'hash=%s' % hashlib.md5('%s-%s-%s-%s' % (ping, ulspeedk, dlspeedk, '297aae72')).hexdigest() 'hash=%s' % hashlib.md5('%s-%s-%s-%s' %
] (ping, ulspeedk, dlspeedk, '297aae72')
).hexdigest()]
req = urllib2.Request('http://www.speedtest.net/api/api.php', data='&'.join(apiData)) req = urllib2.Request('http://www.speedtest.net/api/api.php',
data='&'.join(apiData))
req.add_header('Referer', 'http://c.speedtest.net/flash/speedtest.swf') req.add_header('Referer', 'http://c.speedtest.net/flash/speedtest.swf')
f = urllib2.urlopen(req) f = urllib2.urlopen(req)
response = f.read() response = f.read()
@ -284,4 +298,4 @@ def speedtest():
if __name__ == '__main__': if __name__ == '__main__':
speedtest() speedtest()
# vim:ts=2:sw=2:expandtab # vim:ts=4:sw=4:expandtab

74
speedtest-cli-3
View File

@ -37,9 +37,10 @@ def distance(origin, destination):
dlat = math.radians(lat2-lat1) dlat = math.radians(lat2-lat1)
dlon = math.radians(lon2-lon1) dlon = math.radians(lon2-lon1)
a = math.sin(dlat/2) * math.sin(dlat/2) + math.cos(math.radians(lat1)) \ a = (math.sin(dlat / 2) * math.sin(dlat / 2) + math.cos(math.radians(lat1))
* math.cos(math.radians(lat2)) * math.sin(dlon/2) * math.sin(dlon/2) * math.cos(math.radians(lat2)) * math.sin(dlon / 2)
c = 2 * math.atan2(math.sqrt(a), math.sqrt(1-a)) * math.sin(dlon / 2))
c = 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a))
d = radius * c d = radius * c
return d return d
@ -57,7 +58,7 @@ class FileGetter(threading.Thread):
def run(self): def run(self):
try: try:
if ( time.time() - self.starttime ) <= 10: if (time.time() - self.starttime) <= 10:
f = urllib.request.urlopen(self.url) f = urllib.request.urlopen(self.url)
contents = f.read() contents = f.read()
f.close() f.close()
@ -70,6 +71,7 @@ class FileGetter(threading.Thread):
def downloadSpeed(files): def downloadSpeed(files):
start = time.time() start = time.time()
def producer(q, files): def producer(q, files):
for file in files: for file in files:
thread = FileGetter(file, start) thread = FileGetter(file, start)
@ -79,6 +81,7 @@ def downloadSpeed(files):
sys.stdout.flush() sys.stdout.flush()
finished = [] finished = []
def consumer(q, total_files): def consumer(q, total_files):
while len(finished) < total_files: while len(finished) < total_files:
thread = q.get(True) thread = q.get(True)
@ -93,7 +96,8 @@ def downloadSpeed(files):
cons_thread.start() cons_thread.start()
prod_thread.join() prod_thread.join()
cons_thread.join() cons_thread.join()
return (len(b''.join([chunk if isinstance(chunk, bytes) else chunk.encode() for chunk in finished]))/(time.time()-start)) return (len(b''.join([chunk if isinstance(chunk, bytes) else chunk.encode()
for chunk in finished]))/(time.time()-start))
class FilePutter(threading.Thread): class FilePutter(threading.Thread):
@ -109,7 +113,7 @@ class FilePutter(threading.Thread):
def run(self): def run(self):
try: try:
if ( time.time() - self.starttime ) <= 10: if (time.time() - self.starttime) <= 10:
f = urllib.request.urlopen(self.url, self.data) f = urllib.request.urlopen(self.url, self.data)
contents = f.read() contents = f.read()
f.close() f.close()
@ -122,6 +126,7 @@ class FilePutter(threading.Thread):
def uploadSpeed(url, sizes): def uploadSpeed(url, sizes):
start = time.time() start = time.time()
def producer(q, sizes): def producer(q, sizes):
for size in sizes: for size in sizes:
thread = FilePutter(url, start, size) thread = FilePutter(url, start, size)
@ -131,6 +136,7 @@ def uploadSpeed(url, sizes):
sys.stdout.flush() sys.stdout.flush()
finished = [] finished = []
def consumer(q, total_sizes): def consumer(q, total_sizes):
while len(finished) < total_sizes: while len(finished) < total_sizes:
thread = q.get(True) thread = q.get(True)
@ -145,13 +151,17 @@ def uploadSpeed(url, sizes):
cons_thread.start() cons_thread.start()
prod_thread.join() prod_thread.join()
cons_thread.join() cons_thread.join()
return (len(b''.join([chunk if isinstance(chunk, bytes) else chunk.encode() for chunk in finished]))/(time.time()-start)) return (len(b''.join([chunk if isinstance(chunk, bytes) else chunk.encode()
for chunk in finished]))/(time.time()-start))
def getConfig(): def getConfig():
"""Download the speedtest.net configuration and return only the data we are interested in""" """Download the speedtest.net configuration and return only the data
we are interested in
"""
uh = urllib.request.urlopen('http://www.speedtest.net/speedtest-config.php') uh = urllib.request.urlopen('http://www.speedtest.net/'
'speedtest-config.php')
configxml = uh.read() configxml = uh.read()
if int(uh.getcode()) != 200: if int(uh.getcode()) != 200:
return None return None
@ -161,13 +171,14 @@ def getConfig():
'client': root.find('client').attrib, 'client': root.find('client').attrib,
'times': root.find('times').attrib, 'times': root.find('times').attrib,
'download': root.find('download').attrib, 'download': root.find('download').attrib,
'upload': root.find('upload').attrib 'upload': root.find('upload').attrib}
}
return config return config
def closestServers(client): def closestServers(client):
"""Determine the 5 closest speedtest.net servers based on geographic distance""" """Determine the 5 closest speedtest.net servers based on geographic
distance
"""
uh = urllib.request.urlopen('http://speedtest.net/speedtest-servers.php') uh = urllib.request.urlopen('http://speedtest.net/speedtest-servers.php')
serversxml = uh.read() serversxml = uh.read()
@ -177,7 +188,8 @@ def closestServers(client):
root = ET.fromstring(serversxml) root = ET.fromstring(serversxml)
servers = {} servers = {}
for server in root[0]: for server in root[0]:
d = distance([float(client['lat']), float(client['lon'])], [float(server.get('lat')), float(server.get('lon'))]) d = distance([float(client['lat']), float(client['lon'])],
[float(server.get('lat')), float(server.get('lon'))])
servers[d] = server.attrib servers[d] = server.attrib
closest = [] closest = []
@ -190,13 +202,15 @@ def closestServers(client):
def getBestServer(servers): def getBestServer(servers):
"""Perform a speedtest.net "ping" to determine which speedtest.net server has the lowest latency""" """Perform a speedtest.net "ping" to determine which speedtest.net
server has the lowest latency
"""
results = {} results = {}
for server in servers: for server in servers:
cum = 0 cum = 0
url = os.path.dirname(server['url']) url = os.path.dirname(server['url'])
for i in range(0,3): for i in range(0, 3):
uh = urllib.request.urlopen('%s/latency.txt' % url) uh = urllib.request.urlopen('%s/latency.txt' % url)
start = time.time() start = time.time()
text = uh.read().strip() text = uh.read().strip()
@ -206,7 +220,7 @@ def getBestServer(servers):
else: else:
cum += 3600 cum += 3600
uh.close() uh.close()
avg = round((cum/3)*1000000,3) avg = round((cum / 3) * 1000000, 3)
results[avg] = server results[avg] = server
best = results[sorted(results.keys())[0]] best = results[sorted(results.keys())[0]]
@ -231,24 +245,25 @@ def speedtest():
sizes = [350, 500, 750, 1000, 1500, 2000, 2500, 3000, 3500, 4000] sizes = [350, 500, 750, 1000, 1500, 2000, 2500, 3000, 3500, 4000]
urls = [] urls = []
for size in sizes: for size in sizes:
for i in range(0,4): for i in range(0, 4):
urls.append('%s/random%sx%s.jpg' % (os.path.dirname(best['url']), size, size)) urls.append('%s/random%sx%s.jpg' % (os.path.dirname(best['url']),
size, size))
print('Testing download speed', end='') print('Testing download speed', end='')
dlspeed = downloadSpeed(urls) dlspeed = downloadSpeed(urls)
print('\nDownload: %s Mbit/s' % round((dlspeed/1024/1024)*8,2)) print('\nDownload: %s Mbit/s' % round((dlspeed / 1024 / 1024) * 8, 2))
sizesizes = [int(.25*1024*1024), int(.5*1024*1024)] sizesizes = [int(.25 * 1024 * 1024), int(.5 * 1024 * 1024)]
sizes = [] sizes = []
for size in sizesizes: for size in sizesizes:
for i in range(0,25): for i in range(0, 25):
sizes.append(size) sizes.append(size)
print('Testing upload speed', end='') print('Testing upload speed', end='')
ulspeed = uploadSpeed(best['url'], sizes) ulspeed = uploadSpeed(best['url'], sizes)
print('\nUpload speed: %s Mbit/s' % round((ulspeed/1024/1024)*8,2)) print('\nUpload speed: %s Mbit/s' % round((ulspeed / 1024 / 1024) * 8, 2))
dlspeedk = int(round((dlspeed/1024)*8, 0)) dlspeedk = int(round((dlspeed / 1024) * 8, 0))
ping = int(round(best['latency'], 0)) ping = int(round(best['latency'], 0))
ulspeedk = int(round((ulspeed/1024)*8, 0)) ulspeedk = int(round((ulspeed / 1024) * 8, 0))
apiData = [ apiData = [
'download=%s' % dlspeedk, 'download=%s' % dlspeedk,
@ -259,10 +274,12 @@ def speedtest():
'recommendedserverid=%s' % best['id'], 'recommendedserverid=%s' % best['id'],
'accuracy=%s' % 1, 'accuracy=%s' % 1,
'serverid=%s' % best['id'], 'serverid=%s' % best['id'],
'hash=%s' % hashlib.md5(('%s-%s-%s-%s' % (ping, ulspeedk, dlspeedk, '297aae72')).encode()).hexdigest() 'hash=%s' % hashlib.md5(('%s-%s-%s-%s' %
] (ping, ulspeedk, dlspeedk, '297aae72'))
.encode()).hexdigest()]
req = urllib.request.Request('http://www.speedtest.net/api/api.php', data='&'.join(apiData).encode()) req = urllib.request.Request('http://www.speedtest.net/api/api.php',
data='&'.join(apiData).encode())
req.add_header('Referer', 'http://c.speedtest.net/flash/speedtest.swf') req.add_header('Referer', 'http://c.speedtest.net/flash/speedtest.swf')
f = urllib.request.urlopen(req) f = urllib.request.urlopen(req)
response = f.read() response = f.read()
@ -279,7 +296,8 @@ def speedtest():
print('Could not submit results to speedtest.net') print('Could not submit results to speedtest.net')
sys.exit(1) sys.exit(1)
print('Share results: http://www.speedtest.net/result/%s.png' % resultid[0].decode()) print('Share results: http://www.speedtest.net/result/%s.png' % resultid[0]
.decode())
if __name__ == '__main__': if __name__ == '__main__':
speedtest() speedtest()