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

change: output style

This commit is contained in:
Mert Doğu 2022-02-05 20:27:08 +03:00
parent 22210ca352
commit 7417992b90
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
speedtest.py
View File

@ -781,6 +781,7 @@ def print_dots(shutdown_event):
if event_is_set(shutdown_event): if event_is_set(shutdown_event):
return return
sys.stdout.write('.') sys.stdout.write('.')
if current + 1 == total and end is True: if current + 1 == total and end is True:
sys.stdout.write('\n') sys.stdout.write('\n')
@ -1910,11 +1911,10 @@ def shell():
raise raise
sys.exit(0) sys.exit(0)
printer('Testing from %(isp)s (%(ip)s)...' % speedtest.config['client'], printer(' ISP: %(isp)s (%(ip)s)...' % speedtest.config['client'],
quiet) quiet)
if not args.mini: if not args.mini:
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)
except NoMatchedServers: except NoMatchedServers:
@ -1933,25 +1933,23 @@ def shell():
if args.server and len(args.server) == 1: if args.server and len(args.server) == 1:
printer('Retrieving information for the selected server...', quiet) printer('Retrieving information for the selected server...', quiet)
else: # else:
printer('Selecting best server based on ping...', quiet) # printer('Selecting best server based on ping...', quiet)
speedtest.get_best_server() speedtest.get_best_server()
elif args.mini: elif args.mini:
speedtest.get_best_server(speedtest.set_mini_server(args.mini)) speedtest.get_best_server(speedtest.set_mini_server(args.mini))
results = speedtest.results results = speedtest.results
printer('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: ' printer(' Server: %(sponsor)s (%(name)s) [%(d)0.2f km]: '
'%(latency)s ms' % results.server, quiet) '%(latency)s ms' % results.server, quiet)
if args.download: if args.download:
printer('Testing download speed', quiet, printer(' Testing download speed | ', quiet,
end=('', '\n')[bool(debug)]) end=('', '\n')[bool(debug)])
speedtest.download( speedtest.download(
callback=callback,
threads=(None, 1)[args.single]
) )
printer('Download: %0.2f M%s/s' % printer('%0.2f M%s/s' %
((results.download / 1000.0 / 1000.0) / args.units[1], ((results.download / 1000.0 / 1000.0) / args.units[1],
args.units[0]), args.units[0]),
quiet) quiet)
@ -1959,14 +1957,13 @@ def shell():
printer('Skipping download test', quiet) printer('Skipping download test', quiet)
if args.upload: if args.upload:
printer('Testing upload speed', quiet, printer(' Testing upload speed | ', quiet,
end=('', '\n')[bool(debug)]) end=('', '\n')[bool(debug)])
speedtest.upload( speedtest.upload(
callback=callback,
pre_allocate=args.pre_allocate, pre_allocate=args.pre_allocate,
threads=(None, 1)[args.single] threads=(None, 1)[args.single]
) )
printer('Upload: %0.2f M%s/s' % printer('%0.2f M%s/s' %
((results.upload / 1000.0 / 1000.0) / args.units[1], ((results.upload / 1000.0 / 1000.0) / args.units[1],
args.units[0]), args.units[0]),
quiet) quiet)