From 942f551188a3e8fdb56fa03d7e633d412c9644ea Mon Sep 17 00:00:00 2001 From: Paul J Warner Date: Sun, 22 Nov 2015 15:43:40 -0600 Subject: [PATCH 1/2] Added the ability for the application to return the results as part of another programs run process --- speedtest_cli.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/speedtest_cli.py b/speedtest_cli.py index d93d5c3..a148d40 100755 --- a/speedtest_cli.py +++ b/speedtest_cli.py @@ -547,7 +547,7 @@ def version(): raise SystemExit(__version__) -def speedtest(): +def speedtest(**kwargs): """Run the full speedtest.net test""" global shutdown_event, source, scheme @@ -715,7 +715,7 @@ def speedtest(): urls.append('%s/random%sx%s.jpg' % (os.path.dirname(best['url']), size, size)) if not args.simple: - print_('Testing download speed', end='') + print_('Testing download speed PJW', end='') dlspeed = downloadSpeed(urls, args.simple) if not args.simple: print_() @@ -784,6 +784,13 @@ def speedtest(): print_('Share results: %s://www.speedtest.net/result/%s.png' % (scheme, resultid[0])) + speeds = { + 'DL': (dlspeed / 1000 / 1000) * args.units[1], + 'UL': (ulspeed / 1000 / 1000) * args.units[1] + } + + return speeds + def main(): try: From 39916a3fd84ca90b158e8d18bf66698e033171a4 Mon Sep 17 00:00:00 2001 From: Paul J Warner Date: Sun, 22 Nov 2015 15:45:14 -0600 Subject: [PATCH 2/2] accidentally left some artifacts from testing --- speedtest_cli.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/speedtest_cli.py b/speedtest_cli.py index a148d40..e6a64fd 100755 --- a/speedtest_cli.py +++ b/speedtest_cli.py @@ -547,7 +547,7 @@ def version(): raise SystemExit(__version__) -def speedtest(**kwargs): +def speedtest(): """Run the full speedtest.net test""" global shutdown_event, source, scheme @@ -715,7 +715,7 @@ def speedtest(**kwargs): urls.append('%s/random%sx%s.jpg' % (os.path.dirname(best['url']), size, size)) if not args.simple: - print_('Testing download speed PJW', end='') + print_('Testing download speed ', end='') dlspeed = downloadSpeed(urls, args.simple) if not args.simple: print_()