From 5455ca0e9593a55ac3f5160f4be4debd76432433 Mon Sep 17 00:00:00 2001 From: kuzh Date: Sun, 25 Feb 2024 18:38:09 +0100 Subject: [PATCH 1/2] set to only 1 closest server always. --- speedtest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/speedtest.py b/speedtest.py index b5dbecb..316250a 100755 --- a/speedtest.py +++ b/speedtest.py @@ -1845,7 +1845,6 @@ def shell(server=None): signal.signal(signal.SIGINT, ctrl_c(shutdown_event)) args = parse_args() - args.server = server # Print the version and exit if args.version: @@ -1920,7 +1919,8 @@ def shell(server=None): if not args.mini: # printer('Retrieving speedtest.net server list...', quiet) try: - speedtest.get_servers(servers=args.server, exclude=args.exclude) + # speedtest.get_servers(servers=args.server, exclude=args.exclude) + args.server = speedtest.get_closest_servers(1) except NoMatchedServers: raise SpeedtestCLIError( 'No matched servers: %s' % @@ -2029,4 +2029,4 @@ if __name__ == '__main__': break else: time.sleep(1) - # main() \ No newline at end of file + # main(5) \ No newline at end of file From d3ef4dd951475cd7fdc9811fed50aae332a69fef Mon Sep 17 00:00:00 2001 From: kuzh Date: Sun, 25 Feb 2024 18:44:48 +0100 Subject: [PATCH 2/2] delete server argument. --- speedtest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/speedtest.py b/speedtest.py index 316250a..ff7bb0e 100755 --- a/speedtest.py +++ b/speedtest.py @@ -1836,7 +1836,7 @@ def printer(string, quiet=False, debug=False, error=False, **kwargs): # return str(out) -def shell(server=None): +def shell(): """Run the full speedtest.net test""" global DEBUG @@ -2000,10 +2000,10 @@ def shell(server=None): utilities.convert_and_save_to_xlsx(str(results), "tmp/f24-ch1.xlsx") -def main(iteration=1, server=[8018]): +def main(iteration=1): for i in range(iteration): try: - shell(server) + shell() except KeyboardInterrupt: printer('\nCancelling...', error=True) except (SpeedtestException, SystemExit):