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

Allow specifying an alternate server URL 

This fixes #119; I can now run

    python speedtest-cli.py --list-url https://phihag.de/speedtest-cli/serverlist.php

even from a CHINANET Internet connection.
This commit is contained in:
Philipp Hagemeister 2015-01-07 15:08:13 +01:00
parent b0e1e58a0b
commit a297d2167c
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
speedtest_cli.py
View File

@ -352,21 +352,22 @@ def getConfig():
return config return config
def closestServers(client, all=False): def closestServers(client, list_url, all=False):
"""Determine the 5 closest speedtest.net servers based on geographic """Determine the 5 closest speedtest.net servers based on geographic
distance distance
""" """
url = 'http://www.speedtest.net/speedtest-servers-static.php' request = build_request(list_url)
request = build_request(url)
uh = urlopen(request) uh = urlopen(request)
serversxml = [] serversxml = []
while 1: while 1:
serversxml.append(uh.read(10240)) serversxml.append(uh.read(10240))
if len(serversxml[-1]) == 0: if len(serversxml[-1]) == 0:
break break
if int(uh.code) != 200: if getattr(uh, 'code', None) is not None: # Not a file: URL
return None if int(uh.code) != 200:
return None
uh.close() uh.close()
try: try:
try: try:
@ -504,6 +505,11 @@ def speedtest():
parser.add_argument('--source', help='Source IP address to bind to') parser.add_argument('--source', help='Source IP address to bind to')
parser.add_argument('--timeout', default=10, type=int, parser.add_argument('--timeout', default=10, type=int,
help='HTTP timeout in seconds. Default 10') help='HTTP timeout in seconds. Default 10')
parser.add_argument('--list-url', metavar='URL',
help='URL to load the server list from. '
'Start with file: to load from a local file.',
default='http://www.speedtest.net'
'/speedtest-servers-static.php')
parser.add_argument('--version', action='store_true', parser.add_argument('--version', action='store_true',
help='Show the version number and exit') help='Show the version number and exit')
@ -536,7 +542,7 @@ def speedtest():
if not args.simple: if not args.simple:
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'], args.list_url, True)
if args.list: if args.list:
serverList = [] serverList = []
for server in servers: for server in servers:
@ -555,7 +561,7 @@ def speedtest():
pass pass
sys.exit(0) sys.exit(0)
else: else:
servers = closestServers(config['client']) servers = closestServers(config['client'], args.list_url)
if not args.simple: if not args.simple:
print_('Testing from %(isp)s (%(ip)s)...' % config['client']) print_('Testing from %(isp)s (%(ip)s)...' % config['client'])