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

fixed flake8 messages

This commit is contained in:
enavarre 2015-10-05 19:05:45 -03:00
parent 331a810f71
commit a844ecd0b8
1 changed files with 109 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

175
speedtest_cli.py Executable file → Normal file
View File

@ -37,77 +37,108 @@ outfmt = 2
# Messages format # Messages format
msgsfmts = [] msgsfmts = []
msgsfmts.append(['STCE0010', msgsfmts.append(['STCE0010',
'{"CODE":"STCE0010","VALUE":{"DESCRIPTION":"Could not retrieve speedtest.net configuration: %s"}}', '{"CODE":"STCE0010","VALUE":{"DESCRIPTION":'
'Could not retrieve speedtest.net configuration: %s']) '"Could not retrieve speedtest.net'
' configuration: %s"}}',
'Could not retrieve speedtest.net'
' configuration: %s'])
msgsfmts.append(['STCE0020', msgsfmts.append(['STCE0020',
'{"CODE":"STCE0020","VALUE":{"DESCRIPTION":"Failed to parse speedtest.net configuration"}}', '{"CODE":"STCE0020","VALUE":{"DESCRIPTION":"Failed to parse'
'Could not retrieve speedtest.net configuration: %s']) ' speedtest.net configuration"}}',
'Could not retrieve speedtest.net configuration: %s'])
msgsfmts.append(['STCE0030', msgsfmts.append(['STCE0030',
'{"CODE":"STCE0030","VALUE":{"DESCRIPTION":"Failed to retrieve list of speedtest.net servers: %s"}}', '{"CODE":"STCE0030","VALUE":{"DESCRIPTION":'
'Failed to retrieve list of speedtest.net servers:\n\n %s']) '"Failed to retrieve'
' list of speedtest.net servers: %s"}}',
'Failed to retrieve list of speedtest.net servers:\n\n %s'])
msgsfmts.append(['STCI0010', msgsfmts.append(['STCI0010',
'{"CODE":"STCI0010","VALUE":{"DESCRIPTION":"Retrieving speedtest.net configuration"}}', '{"CODE":"STCI0010","VALUE":{"DESCRIPTION":"Retrieving'
'Retrieving speedtest.net configuration...']) ' speedtest.net configuration"}}',
'Retrieving speedtest.net configuration...'])
msgsfmts.append(['STCE0050', msgsfmts.append(['STCE0050',
'{"CODE":"STCE0050","VALUE":{"DESCRIPTION":"Cannot retrieve speedtest configuration"}}', '{"CODE":"STCE0050","VALUE":{"DESCRIPTION":"Cannot retrieve'
'Cannot retrieve speedtest configuration']) ' speedtest configuration"}}',
'Cannot retrieve speedtest configuration'])
msgsfmts.append(['STCI0020', msgsfmts.append(['STCI0020',
'{"CODE":"STCI0020","VALUE":{"DESCRIPTION":"Retrieving speedtest.net server list"}}', '{"CODE":"STCI0020","VALUE":{"DESCRIPTION":"Retrieving'
'Retrieving speedtest.net server list...']) ' speedtest.net server list"}}',
'Retrieving speedtest.net server list...'])
msgsfmts.append(['STCI0030', msgsfmts.append(['STCI0030',
'{"CODE":"STCI0030","VALUE":{"DESCRIPTION":"Testing from", "ISP":"%(isp)s","IP":"%(ip)s"}}', '{"CODE":"STCI0030","VALUE":{"DESCRIPTION":"Testing from",'
'Testing from %(isp)s (%(ip)s)...']) ' "ISP":"%(isp)s","IP":"%(ip)s"}}',
'Testing from %(isp)s (%(ip)s)...'])
msgsfmts.append(['STCE0060', msgsfmts.append(['STCE0060',
'{"CODE":"STCE0060","VALUE":{"DESCRIPTION":"Invalid server ID"}}', '{"CODE":"STCE0060","VALUE":{"DESCRIPTION":"Invalid server'
'Invalid server ID']) ' ID"}}',
'Invalid server ID'])
msgsfmts.append(['STCE0070', msgsfmts.append(['STCE0070',
'{"CODE":"STCE0070","VALUE":{"DESCRIPTION":"Invalid Speedtest Mini URL"}}', '{"CODE":"STCE0070","VALUE":{"DESCRIPTION":"Invalid'
'Invalid Speedtest Mini URL']) ' Speedtest Mini URL"}}',
'Invalid Speedtest Mini URL'])
msgsfmts.append(['STCI0040', msgsfmts.append(['STCI0040',
'{"CODE":"STCI0040","VALUE":{"DESCRIPTION":"Please provide the full URL of your Speedtest Mini server"}}', '{"CODE":"STCI0040","VALUE":{"DESCRIPTION":"Please'
'Please provide the full URL of your Speedtest Mini server']) ' provide the full URL of your Speedtest Mini server"}}',
'Please provide the full URL of your Speedtest Mini server'])
msgsfmts.append(['STCI0050', msgsfmts.append(['STCI0050',
'{"CODE":"STCI0050","VALUE":{"DESCRIPTION":"Selecting best server based on latency"}}', '{"CODE":"STCI0050","VALUE":{"DESCRIPTION":"Selecting best'
'Selecting best server based on latency...']) ' server based on latency"}}',
'Selecting best server based on latency...'])
msgsfmts.append(['STCI0060', msgsfmts.append(['STCI0060',
'{"CODE":"STCI0060","VALUE":{"DESCRIPTION":"Hosted by", "NAME":"%(sponsor)s","LOCATION":"%(name)s","DISTANCE":"%(d)0.2f km","LATENCY":"%(latency)s ms"}}', '{"CODE":"STCI0060","VALUE":{"DESCRIPTION":"Hosted by",'
'Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: %(latency)s ms']) ' "NAME":"%(sponsor)s","LOCATION":"%(name)s","DISTANCE"'
':"%(d)0.2f km","LATENCY":"%(latency)s ms"}}',
'Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]:'
' %(latency)s ms'])
msgsfmts.append(['STCI0070', msgsfmts.append(['STCI0070',
'{"CODE":"STCI0070","VALUE":{"DESCRIPTION":"Ping","LATENCY":"%(latency)s ms"}}', '{"CODE":"STCI0070","VALUE":{"DESCRIPTION":"Ping",'
'Ping: %(latency)s ms']) '"LATENCY":"%(latency)s ms"}}',
'Ping: %(latency)s ms'])
msgsfmts.append(['STCI0080', msgsfmts.append(['STCI0080',
'{"CODE":"STCI0080","VALUE":{"DESCRIPTION":"Testing download speed"}}', '{"CODE":"STCI0080","VALUE":{"DESCRIPTION":"Testing download'
'Testing download speed...']) ' speed"}}',
'Testing download speed...'])
msgsfmts.append(['STCI0090', msgsfmts.append(['STCI0090',
'{"CODE":"STCI0090","VALUE":{"DESCRIPTION":"Download Speed","SPEED":"%0.2f M%s/s"}}', '{"CODE":"STCI0090","VALUE":{"DESCRIPTION":"Download Speed",'
'Download: %0.2f M%s/s']) '"SPEED":"%0.2f M%s/s"}}',
'Download: %0.2f M%s/s'])
msgsfmts.append(['STCI0100', msgsfmts.append(['STCI0100',
'{"CODE":"STCI0100","VALUE":{"DESCRIPTION":"Testing upload speed"}}', '{"CODE":"STCI0100","VALUE":{"DESCRIPTION":"Testing upload'
'Testing upload speed...']) ' speed"}}',
'Testing upload speed...'])
msgsfmts.append(['STCI0110', msgsfmts.append(['STCI0110',
'{"CODE":"STCI0110","VALUE":{"DESCRIPTION":"Upload Speed","SPEED":"%0.2f M%s/s"}}', '{"CODE":"STCI0110","VALUE":{"DESCRIPTION":"Upload Speed",'
'Upload: %0.2f M%s/s']) '"SPEED":"%0.2f M%s/s"}}',
'Upload: %0.2f M%s/s'])
msgsfmts.append(['STCE0080', msgsfmts.append(['STCE0080',
'{"CODE":"STCE0080","VALUE":{"DESCRIPTION":"Cannot generate a speedtest.net share results image while testing against a Speedtest Mini server"}}', '{"CODE":"STCE0080","VALUE":{"DESCRIPTION":"Cannot generate'
'Cannot generate a speedtest.net share results image while testing against a Speedtest Mini server']) ' a speedtest.net share results image while testing against'
' a Speedtest Mini server"}}',
'Cannot generate a speedtest.net share results image while'
' testing against a Speedtest Mini server'])
msgsfmts.append(['STCE0090', msgsfmts.append(['STCE0090',
'{"CODE":"STCE0090","VALUE":{"DESCRIPTION":"Could not submit results to speedtest.net: %s"}}', '{"CODE":"STCE0090","VALUE":{"DESCRIPTION":"Could not submit'
'Could not submit results to speedtest.net: %s']) ' results to speedtest.net: %s"}}',
'Could not submit results to speedtest.net: %s'])
msgsfmts.append(['STCE0100', msgsfmts.append(['STCE0100',
'{"CODE":"STCE0100","VALUE":{"DESCRIPTION":"Could not submit results to speedtest.net"}}', '{"CODE":"STCE0100","VALUE":{"DESCRIPTION":"Could not submit'
'Could not submit results to speedtest.net']) ' results to speedtest.net"}}',
'Could not submit results to speedtest.net'])
msgsfmts.append(['STCE0110', msgsfmts.append(['STCE0110',
'{"CODE":"STCE0110","VALUE":{"DESCRIPTION":"Could not submit results to speedtest.net"}}', '{"CODE":"STCE0110","VALUE":{"DESCRIPTION":"Could not submit'
'Could not submit results to speedtest.net']) ' results to speedtest.net"}}',
'Could not submit results to speedtest.net'])
msgsfmts.append(['STCI0120', msgsfmts.append(['STCI0120',
'{"CODE":"STCI0120","VALUE":{"DESCRIPTION":"Share results","LINK":"%s://www.speedtest.net/result/%s.png"}}', '{"CODE":"STCI0120","VALUE":{"DESCRIPTION":"Share results",'
'Share results: %s://www.speedtest.net/result/%s.png']) '"LINK":"%s://www.speedtest.net/result/%s.png"}}',
'Share results: %s://www.speedtest.net/result/%s.png'])
msgsfmts.append(['STCI0130', msgsfmts.append(['STCI0130',
'{"CODE":"STCI0130","VALUE":{"DESCRIPTION":"Cancelling"}}', '{"CODE":"STCI0130","VALUE":{"DESCRIPTION":"Cancelling"}}',
'Cancelling...']) 'Cancelling...'])
msgsfmts.append(['STCI0140', msgsfmts.append(['STCI0140',
'{"CODE":"STCI0140","VALUE":{"DESCRIPTION":"Entry","ID":"%(id)4s","SPONSOR":"%(sponsor)s","NAME":"%(name)s","COUNTRY":"%(country)s", "DISTANCE":"%(d)0.2f km"}}', '{"CODE":"STCI0140","VALUE":{"DESCRIPTION":"Entry","ID":'
'%(id)4s) %(sponsor)s (%(name)s, %(country)s) [%(d)0.2f km]']) '"%(id)4s","SPONSOR":"%(sponsor)s","NAME":"%(name)s",'
'"COUNTRY":"%(country)s", "DISTANCE":"%(d)0.2f km"}}',
'%(id)4s) %(sponsor)s (%(name)s, %(country)s) [%(d)0.2f km]'])
# Used for bound_interface # Used for bound_interface
socket_socket = socket.socket socket_socket = socket.socket
@ -211,6 +242,7 @@ except ImportError:
else: else:
newline = "\n" newline = "\n"
space = " " space = " "
if sep is None: if sep is None:
sep = space sep = space
if end is None: if end is None:
@ -231,9 +263,10 @@ class SpeedtestCliServerListError(Exception):
""" """
def msgfmt(code): def msgfmt(code):
for i in range(len(msgsfmts)): for i in range(len(msgsfmts)):
current = msgsfmts[i]; current = msgsfmts[i]
if current[0] == code: if current[0] == code:
return current[outfmt] return current[outfmt]
return "<NOMSGFMT>" return "<NOMSGFMT>"
@ -252,6 +285,7 @@ def endmsg():
else: else:
return '\n' return '\n'
def bound_socket(*args, **kwargs): def bound_socket(*args, **kwargs):
"""Bind socket to a specified source IP address""" """Bind socket to a specified source IP address"""
@ -504,9 +538,11 @@ def getConfig():
del configxml del configxml
return config return config
def html_escape(text): def html_escape(text):
html_escape_table = { '"': "&quot;" } html_escape_table = {'"': "&quot;"}
return "".join(html_escape_table.get(c,c) for c in text) return "".join(html_escape_table.get(c, c) for c in text)
def closestServers(client, all=False): def closestServers(client, all=False):
"""Determine the 5 closest speedtest.net servers based on geographic """Determine the 5 closest speedtest.net servers based on geographic
@ -677,8 +713,8 @@ def speedtest():
parser.add_argument('--simple', action='store_true', parser.add_argument('--simple', action='store_true',
help='Suppress verbose output, only show basic ' help='Suppress verbose output, only show basic '
'information') 'information')
parser.add_argument('--json', dest='outfmt', action='store_const', parser.add_argument('--json', dest='outfmt', action='store_const',
const=('json', 1), default=('text', 2), const=('json', 1), default=('text', 2),
help='Display info in JSON format') help='Display info in JSON format')
parser.add_argument('--list', action='store_true', parser.add_argument('--list', action='store_true',
help='Display a list of speedtest.net servers ' help='Display a list of speedtest.net servers '
@ -703,7 +739,7 @@ def speedtest():
outfmt = args.outfmt[1] outfmt = args.outfmt[1]
if outfmt == 1: if outfmt == 1:
print_('[',end='') print_('[', end='')
# Print the version and exit # Print the version and exit
if args.version: if args.version:
@ -738,12 +774,14 @@ def speedtest():
serverList = [] serverList = []
for server in servers: for server in servers:
serverList.append(msgfmt('STCI0140') % server) serverList.append(msgfmt('STCI0140') % server)
if (not server is servers[-1]): if (not (server is servers[-1])):
serverList.append(endln()) serverList.append(endln())
if outfmt == 2: if outfmt == 2:
print_(''.join(serverList).encode('utf-8', 'ignore'), end=endmsg()) print_(''.join(serverList).encode('utf-8', 'ignore'),
end=endmsg())
else: else:
print_(''.join(serverList).encode('utf-8', 'ignore'), end=endmsg()) print_(''.join(serverList).encode('utf-8', 'ignore'),
end=endmsg())
sys.exit(0) sys.exit(0)
else: else:
servers = closestServers(config['client']) servers = closestServers(config['client'])
@ -753,7 +791,7 @@ def speedtest():
if args.server: if args.server:
try: try:
best = getBestServer(filter(lambda x: x['id'] == args.server, best = getBestServer(filter(lambda x: x['id'] == args.server,
servers)) servers))
except IndexError: except IndexError:
print_(msgfmt('STCE0060'), end=endmsg()) print_(msgfmt('STCE0060'), end=endmsg())
@ -769,7 +807,7 @@ def speedtest():
request = build_request(args.mini) request = build_request(args.mini)
f = urlopen(request) f = urlopen(request)
except: except:
print_(msgfmt('STCE0070'),end=endmsg()) print_(msgfmt('STCE0070'), end=endmsg())
sys.exit(1) sys.exit(1)
else: else:
text = f.read() text = f.read()
@ -791,7 +829,7 @@ def speedtest():
extension = [ext] extension = [ext]
break break
if not urlparts or not extension: if not urlparts or not extension:
print_(msgfmt('STCI0040'),end=endmsg()) print_(msgfmt('STCI0040'), end=endmsg())
sys.exit(1) sys.exit(1)
servers = [{ servers = [{
'sponsor': 'Speedtest Mini', 'sponsor': 'Speedtest Mini',
@ -807,13 +845,14 @@ def speedtest():
best = servers[0] best = servers[0]
else: else:
if not args.simple: if not args.simple:
print_(msgfmt('STCI0050'),end=endln()) print_(msgfmt('STCI0050'), end=endln())
best = getBestServer(servers) best = getBestServer(servers)
if not args.simple: if not args.simple:
print_((msgfmt('STCI0060') % best).encode('utf-8', 'ignore'),end=endln()) print_((msgfmt('STCI0060') % best).encode('utf-8', 'ignore'),
end=endln())
else: else:
print_(msgfmt('STCI0070') % best,end=endln()) print_(msgfmt('STCI0070') % best, end=endln())
sizes = [350, 500, 750, 1000, 1500, 2000, 2500, 3000, 3500, 4000] sizes = [350, 500, 750, 1000, 1500, 2000, 2500, 3000, 3500, 4000]
urls = [] urls = []
@ -829,7 +868,9 @@ def speedtest():
dlspeed = downloadSpeed(urls, args.simple) dlspeed = downloadSpeed(urls, args.simple)
if outfmt == 2 and not args.simple: if outfmt == 2 and not args.simple:
print_() print_()
print_(msgfmt('STCI0090') %((dlspeed / 1000 / 1000) * args.units[1], args.units[0]),end=endln()) print_(msgfmt('STCI0090') % ((dlspeed / 1000 / 1000) * args.units[1],
args.units[0]),
end=endln())
sizesizes = [int(.25 * 1000 * 1000), int(.5 * 1000 * 1000)] sizesizes = [int(.25 * 1000 * 1000), int(.5 * 1000 * 1000)]
sizes = [] sizes = []
@ -844,7 +885,9 @@ def speedtest():
ulspeed = uploadSpeed(best['url'], sizes, args.simple) ulspeed = uploadSpeed(best['url'], sizes, args.simple)
if outfmt == 2 and not args.simple: if outfmt == 2 and not args.simple:
print_() print_()
print_(msgfmt('STCI0110') % ((ulspeed / 1000 / 1000) * args.units[1], args.units[0]), end=endmsg()) print_(msgfmt('STCI0110') % ((ulspeed / 1000 / 1000) * args.units[1],
args.units[0]),
end=endmsg())
if args.share and args.mini: if args.share and args.mini:
print_(msgfmt('STCE0080'), end=endln()) print_(msgfmt('STCE0080'), end=endln())
@ -904,4 +947,4 @@ def main():
if __name__ == '__main__': if __name__ == '__main__':
main() main()
# vim:ts=4:sw=4:expandtab # vim:ts=4:sw=4:expandtab