From ce3f21f9b142b116c775cd6fd626e832ead2e270 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 10 Mar 2021 15:47:12 +0000
Subject: [PATCH] quiet option when getting json

---
 session.py | 31 ++++++++++++++++++-------------
 speaker.py |  2 +-
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/session.py b/session.py
index a64d8da0a..b3008fb1c 100644
--- a/session.py
+++ b/session.py
@@ -86,7 +86,7 @@ def urlExists(session, url: str, timeoutSec=3,
 
 def getJson(session, url: str, headers: {}, params: {},
             version='1.2.0', httpPrefix='https',
-            domain='testdomain', timeoutSec=20) -> {}:
+            domain='testdomain', timeoutSec=20, quiet=False) -> {}:
     if not isinstance(url, str):
         print('url: ' + str(url))
         print('ERROR: getJson failed, url should be a string')
@@ -102,7 +102,8 @@ def getJson(session, url: str, headers: {}, params: {},
         sessionHeaders['User-Agent'] += \
             '; +' + httpPrefix + '://' + domain + '/'
     if not session:
-        print('WARN: getJson failed, no session specified for getJson')
+        if not quiet:
+            print('WARN: getJson failed, no session specified for getJson')
         return None
     try:
         result = session.get(url, headers=sessionHeaders,
@@ -112,22 +113,26 @@ def getJson(session, url: str, headers: {}, params: {},
         sessionHeaders2 = sessionHeaders.copy()
         if sessionHeaders2.get('Authorization'):
             sessionHeaders2['Authorization'] = 'REDACTED'
-        print('ERROR: getJson failed\nurl: ' + str(url) + ' ' +
-              'headers: ' + str(sessionHeaders2) + ' ' +
-              'params: ' + str(sessionParams))
-        print(e)
+        if not quiet:
+            print('ERROR: getJson failed\nurl: ' + str(url) + ' ' +
+                  'headers: ' + str(sessionHeaders2) + ' ' +
+                  'params: ' + str(sessionParams))
+            print(e)
     except ValueError as e:
         sessionHeaders2 = sessionHeaders.copy()
         if sessionHeaders2.get('Authorization'):
             sessionHeaders2['Authorization'] = 'REDACTED'
-        print('ERROR: getJson failed\nurl: ' + str(url) + ' ' +
-              'headers: ' + str(sessionHeaders2) + ' ' +
-              'params: ' + str(sessionParams) + ' ')
-        print(e)
+        if not quiet:
+            print('ERROR: getJson failed\nurl: ' + str(url) + ' ' +
+                  'headers: ' + str(sessionHeaders2) + ' ' +
+                  'params: ' + str(sessionParams) + ' ')
+            print(e)
     except SocketError as e:
-        if e.errno == errno.ECONNRESET:
-            print('WARN: getJson failed, connection was reset during getJson')
-        print(e)
+        if not quiet:
+            if e.errno == errno.ECONNRESET:
+                print('WARN: getJson failed, ' +
+                      'connection was reset during getJson')
+            print(e)
     return None
 
 
diff --git a/speaker.py b/speaker.py
index 53eb152c7..f6fc31db8 100644
--- a/speaker.py
+++ b/speaker.py
@@ -263,7 +263,7 @@ def getSpeakerFromServer(baseDir: str, session,
 
     speakerJson = \
         getJson(session, url, headers, None,
-                __version__, httpPrefix, domain)
+                __version__, httpPrefix, domain, 20, True)
     return speakerJson