Merge branch 'main' of ssh://code.freedombone.net:2222/bashrc/epicyon into main

notifications_client.py

@@ -80,7 +80,7 @@ def _playNotificationSound(soundFilename: str, player='ffplay') -> None:
 
     if player == 'ffplay':
         os.system('ffplay ' + soundFilename +
-                  ' -autoexit -hide_banner -nodisp')
+                  ' -autoexit -hide_banner -nodisp 2> /dev/null')
 
 
 def _desktopNotification(notificationType: str,

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,6 +102,7 @@ def getJson(session, url: str, headers: {}, params: {},
         sessionHeaders['User-Agent'] += \
             '; +' + httpPrefix + '://' + domain + '/'
     if not session:
+        if not quiet:
             print('WARN: getJson failed, no session specified for getJson')
         return None
     try:
@@ -112,6 +113,7 @@ def getJson(session, url: str, headers: {}, params: {},
         sessionHeaders2 = sessionHeaders.copy()
         if sessionHeaders2.get('Authorization'):
             sessionHeaders2['Authorization'] = 'REDACTED'
+        if not quiet:
             print('ERROR: getJson failed\nurl: ' + str(url) + ' ' +
                   'headers: ' + str(sessionHeaders2) + ' ' +
                   'params: ' + str(sessionParams))
@@ -120,13 +122,16 @@ def getJson(session, url: str, headers: {}, params: {},
         sessionHeaders2 = sessionHeaders.copy()
         if sessionHeaders2.get('Authorization'):
             sessionHeaders2['Authorization'] = 'REDACTED'
+        if not quiet:
             print('ERROR: getJson failed\nurl: ' + str(url) + ' ' +
                   'headers: ' + str(sessionHeaders2) + ' ' +
                   'params: ' + str(sessionParams) + ' ')
             print(e)
     except SocketError as e:
+        if not quiet:
             if e.errno == errno.ECONNRESET:
-            print('WARN: getJson failed, connection was reset during getJson')
+                print('WARN: getJson failed, ' +
+                      'connection was reset during getJson')
             print(e)
     return None
 

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