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

Add client info to json output and hide message if server is specified

This commit is contained in:
EMEA\gbonetti 2017-07-16 16:23:01 +02:00
parent 6603954e45
commit d5f419eb50
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
speedtest.py
View File

@ -619,7 +619,7 @@ class SpeedtestResults(object):
to get a share results image link. to get a share results image link.
""" """
def __init__(self, download=0, upload=0, ping=0, server=None): def __init__(self, download=0, upload=0, ping=0, server=None, client=None):
self.download = download self.download = download
self.upload = upload self.upload = upload
self.ping = ping self.ping = ping
@ -627,6 +627,7 @@ class SpeedtestResults(object):
self.server = {} self.server = {}
else: else:
self.server = server self.server = server
self.client = client
self._share = None self._share = None
self.timestamp = '%sZ' % datetime.datetime.utcnow().isoformat() self.timestamp = '%sZ' % datetime.datetime.utcnow().isoformat()
self.bytes_received = 0 self.bytes_received = 0
@ -748,7 +749,7 @@ class Speedtest(object):
self.closest = [] self.closest = []
self.best = {} self.best = {}
self.results = SpeedtestResults() self.results = SpeedtestResults(client=self.config['client'])
def get_config(self): def get_config(self):
"""Download the speedtest.net configuration and return only the data """Download the speedtest.net configuration and return only the data
@ -1438,8 +1439,9 @@ def shell():
except InvalidServerIDType: except InvalidServerIDType:
raise SpeedtestCLIError('%s is an invalid server type, must ' raise SpeedtestCLIError('%s is an invalid server type, must '
'be an int' % args.server) 'be an int' % args.server)
if not args.server:
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))