Add option to exclude servers, and allow --server and --exclude to be specified multiple times

This commit is contained in:
Matt Martz 2017-05-12 13:02:35 -05:00
parent ca72d40033
commit 6bfa5922c3
1 changed files with 29 additions and 20 deletions

View File

@ -1063,21 +1063,26 @@ class Speedtest(object):
return self.config
def get_servers(self, servers=None):
def get_servers(self, servers=None, exclude=None):
"""Retrieve a the list of servers, optionally filtered
to servers matching those specified in the ``servers`` argument
if servers is None:
servers = []
if exclude is None:
exclude = []
for i, s in enumerate(servers):
servers[i] = int(s)
except ValueError:
raise InvalidServerIDType('%s is an invalid server type, must '
'be int' % s)
for server_list in (servers, exclude):
for i, s in enumerate(server_list):
server_list[i] = int(s)
except ValueError:
raise InvalidServerIDType(
'%s is an invalid server type, must be int' % s
urls = [
@ -1140,7 +1145,8 @@ class Speedtest(object):
if servers and int(attrib.get('id')) not in servers:
if int(attrib.get('id')) in self.config['ignore_servers']:
if (int(attrib.get('id')) in self.config['ignore_servers']
or int(attrib.get('id')) in exclude):
@ -1162,7 +1168,7 @@ class Speedtest(object):
except ServersRetrievalError:
if servers and not self.servers:
if (servers or exclude) and not self.servers:
raise NoMatchedServers()
return self.servers
@ -1518,8 +1524,11 @@ def parse_args():
parser.add_argument('--list', action='store_true',
help='Display a list of servers '
'sorted by distance')
parser.add_argument('--server', help='Specify a server ID to test against',
parser.add_argument('--server', type=PARSER_TYPE_INT, action='append',
help='Specify a server ID to test against')
parser.add_argument('--exclude', type=PARSER_TYPE_INT, action='append',
help='Exclude a server from selection. Can be '
'supplied multiple times')
parser.add_argument('--mini', help='URL of the Speedtest Mini server')
parser.add_argument('--source', help='Source IP address to bind to')
parser.add_argument('--timeout', default=10, type=PARSER_TYPE_INT,
@ -1658,26 +1667,26 @@ def shell():
# Set a filter of servers to retrieve
servers = []
if args.server:
printer('Testing from %(isp)s (%(ip)s)...' % speedtest.config['client'],
if not
printer('Retrieving server list...', quiet)
speedtest.get_servers(servers=args.server, exclude=args.exclude)
except NoMatchedServers:
raise SpeedtestCLIError('No matched servers: %s' % args.server)
raise SpeedtestCLIError(
'No matched servers: %s' %
', '.join('%s' % s for s in args.server)
except (ServersRetrievalError,) + HTTP_ERRORS:
print_('Cannot retrieve speedtest server list')
raise SpeedtestCLIError(get_exception())
except InvalidServerIDType:
raise SpeedtestCLIError('%s is an invalid server type, must '
'be an int' % args.server)
raise SpeedtestCLIError(
'%s is an invalid server type, must '
'be an int' % ', '.join('%s' % s for s in args.server)
printer('Selecting best server based on ping...', quiet)