From a2d3d72858b7feeda63cc2b381b04b5014ef1a45 Mon Sep 17 00:00:00 2001
From: Ale Almuna <ale@almuna.cl>
Date: Sun, 20 Dec 2015 20:43:08 -0300
Subject: [PATCH] Allow silent mode using 'verbose' parameter

If a verbose=False parameter is passed to the speedtest function, the
test doesn't print any message, but returns the results list.
---
 speedtest_cli.py | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/speedtest_cli.py b/speedtest_cli.py
index 1b27d50..2e0120f 100755
--- a/speedtest_cli.py
+++ b/speedtest_cli.py
@@ -614,10 +614,19 @@ def speedtest(**kwargs):
         opts_dict['secure'] = True if 'secure' in kwargs else False
         opts_dict['version'] = True if 'version' in kwargs else False
         opts_dict['simple'] = kwargs['simple'] if 'simple' in kwargs else False
+        opts_dict['verbose'] = kwargs[
+            'verbose'] if 'verbose' in kwargs else True if opts_dict[
+                'simple'] else False
+        if not opts_dict['verbose']:
+            opts_dict['simple'] = True
 
         # Object to access dictionary values by attribute lookup
         args = type('TestOptions', (object,), opts_dict)
 
+    try:
+        args.verbose
+    except:
+        args.verbose = True
     # Print the version and exit
     if args.version:
         version()
@@ -723,7 +732,7 @@ def speedtest(**kwargs):
     if not args.simple:
         print_(('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: '
                '%(latency)s ms' % best).encode('utf-8', 'ignore'))
-    else:
+    elif args.verbose:
         print_('Ping: %(latency)s ms' % best)
 
     sizes = [350, 500, 750, 1000, 1500, 2000, 2500, 3000, 3500, 4000]
@@ -737,8 +746,9 @@ def speedtest(**kwargs):
     dlspeed = downloadSpeed(urls, args.simple)
     if not args.simple:
         print_()
-    print_('Download: %0.2f M%s/s' %
-           ((dlspeed / 1000 / 1000) * args.units[1], args.units[0]))
+    if args.verbose:
+        print_('Download: %0.2f M%s/s' %
+               ((dlspeed / 1000 / 1000) * args.units[1], args.units[0]))
 
     sizesizes = [int(.25 * 1000 * 1000), int(.5 * 1000 * 1000)]
     sizes = []
@@ -750,8 +760,9 @@ def speedtest(**kwargs):
     ulspeed = uploadSpeed(best['url'], sizes, args.simple)
     if not args.simple:
         print_()
-    print_('Upload: %0.2f M%s/s' %
-           ((ulspeed / 1000 / 1000) * args.units[1], args.units[0]))
+    if args.verbose:
+        print_('Upload: %0.2f M%s/s' %
+               ((ulspeed / 1000 / 1000) * args.units[1], args.units[0]))
 
     if args.share and args.mini:
         print_('Cannot generate a speedtest.net share results image while '