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

Allow --share to work with --simple and --json. Fixes #375

This commit is contained in:
Matt Martz 2017-03-17 16:06:48 -05:00
parent 33e498beb3
commit 55b3cf14a3
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
speedtest.py
View File

@ -669,7 +669,8 @@ class SpeedtestResults(object):
'server': self.server, 'server': self.server,
'timestamp': self.timestamp, 'timestamp': self.timestamp,
'bytes_sent': self.bytes_sent, 'bytes_sent': self.bytes_sent,
'bytes_received': self.bytes_received 'bytes_received': self.bytes_received,
'share': self._share,
} }
def csv(self, delimiter=','): def csv(self, delimiter=','):
@ -1199,7 +1200,7 @@ def parse_args():
'output from --json or --csv') 'output from --json or --csv')
parser.add_argument('--share', action='store_true', parser.add_argument('--share', action='store_true',
help='Generate and provide a URL to the speedtest.net ' help='Generate and provide a URL to the speedtest.net '
'share results image') 'share results image, not displayed with --csv')
parser.add_argument('--simple', action='store_true', default=False, parser.add_argument('--simple', action='store_true', default=False,
help='Suppress verbose output, only show basic ' help='Suppress verbose output, only show basic '
'information') 'information')
@ -1320,6 +1321,11 @@ def shell():
else: else:
quiet = False quiet = False
if args.csv or args.json:
machine_format = True
else:
machine_format = False
# Don't set a callback if we are running quietly # Don't set a callback if we are running quietly
if quiet or debug: if quiet or debug:
callback = do_nothing callback = do_nothing
@ -1409,10 +1415,12 @@ def shell():
elif args.csv: elif args.csv:
print_(results.csv(delimiter=args.csv_delimiter)) print_(results.csv(delimiter=args.csv_delimiter))
elif args.json: elif args.json:
if args.share:
results.share()
print_(results.json()) print_(results.json())
if args.share: if args.share and not machine_format:
printer('Share results: %s' % results.share(), quiet) printer('Share results: %s' % results.share())
def main(): def main():