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

Merge branch 'raspShield' into dev

This commit is contained in:
kuzh 2024-02-25 18:51:49 +01:00
parent 980cea54b8 d3ef4dd951
commit 393099c714
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
speedtest.py
View File

@ -1836,7 +1836,7 @@ def printer(string, quiet=False, debug=False, error=False, **kwargs):
# return str(out) # return str(out)
def shell(server=None): def shell():
"""Run the full speedtest.net test""" """Run the full speedtest.net test"""
global DEBUG global DEBUG
@ -1845,7 +1845,6 @@ def shell(server=None):
signal.signal(signal.SIGINT, ctrl_c(shutdown_event)) signal.signal(signal.SIGINT, ctrl_c(shutdown_event))
args = parse_args() args = parse_args()
args.server = server
# Print the version and exit # Print the version and exit
if args.version: if args.version:
@ -1920,7 +1919,8 @@ def shell(server=None):
if not args.mini: if not args.mini:
# printer('Retrieving speedtest.net server list...', quiet) # printer('Retrieving speedtest.net server list...', quiet)
try: 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: except NoMatchedServers:
raise SpeedtestCLIError( raise SpeedtestCLIError(
'No matched servers: %s' % 'No matched servers: %s' %
@ -2000,10 +2000,10 @@ def shell(server=None):
utilities.convert_and_save_to_xlsx(str(results), "tmp/f24-ch1.xlsx") 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): for i in range(iteration):
try: try:
shell(server) shell()
except KeyboardInterrupt: except KeyboardInterrupt:
printer('\nCancelling...', error=True) printer('\nCancelling...', error=True)
except (SpeedtestException, SystemExit): except (SpeedtestException, SystemExit):
@ -2029,4 +2029,4 @@ if __name__ == '__main__':
break break
else: else:
time.sleep(1) time.sleep(1)
# main() # main(5)