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

Merge 6018c97863 into db46af8bcd

This commit is contained in:
Bob Sutterfield 2021-01-20 01:07:55 -04:00 committed by GitHub
parent db46af8bcd 6018c97863
commit f224c1fcdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
speedtest.py
View File

@ -36,7 +36,7 @@ except ImportError:
gzip = None
GZIP_BASE = object
__version__ = '2.1.2'
__version__ = '2.1.2.reveal-server'
class FakeShutdownEvent(object):
@ -1043,7 +1043,7 @@ class SpeedtestResults(object):
"""Return CSV Headers"""
row = ['Server ID', 'Sponsor', 'Server Name', 'Timestamp', 'Distance',
'Ping', 'Download', 'Upload', 'Share', 'IP Address']
'Ping', 'Download', 'Upload', 'Share', 'Client', 'Server']
out = StringIO()
writer = csv.writer(out, delimiter=delimiter, lineterminator='')
writer.writerow([to_utf8(v) for v in row])
@ -1058,7 +1058,8 @@ class SpeedtestResults(object):
row = [data['server']['id'], data['server']['sponsor'],
data['server']['name'], data['timestamp'],
data['server']['d'], data['ping'], data['download'],
data['upload'], self._share or '', self.client['ip']]
data['upload'], self._share or '', self.client['ip'],
data['server']['host']]
writer.writerow([to_utf8(v) for v in row])
return out.getvalue()
@ -1932,7 +1933,7 @@ def shell():
results = speedtest.results
printer('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: '
printer('Hosted by %(sponsor)s (%(name)s) %(host)s [%(d)0.2f km]: '
'%(latency)s ms' % results.server, quiet)
if args.download: