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

daemon.py

@@ -14305,6 +14305,7 @@ def runDaemon(brochMode: bool,
             return False
 
         print('ERROR: HTTP server failed to start. ' + str(e))
+        print('serverAddress: ' + str(serverAddress))
         return False
 
     # ASCII/ANSI text banner used in shell browsers, such as Lynx

epicyon.py

@@ -1945,9 +1945,12 @@ if args.speaker:
             if speakerJson['say'] != prevSay:
                 if speakerJson.get('name'):
                     nameStr = speakerJson['name']
+                    gender = 'They/Them'
+                    if speakerJson.get('gender'):
+                        gender = speakerJson['gender']
 
                     # get the speech parameters
-                    pitch = getSpeakerPitch(nameStr, args.screenreader)
+                    pitch = getSpeakerPitch(nameStr, args.screenreader, gender)
                     rate = getSpeakerRate(nameStr, args.screenreader)
                     srange = getSpeakerRange(nameStr)
 

speaker.py

@@ -16,13 +16,24 @@ from utils import getFullDomain
 speakerRemoveChars = ('.\n', '. ', ',', ';', '?', '!')
 
 
-def getSpeakerPitch(displayName: str, screenreader: str) -> int:
+def getSpeakerPitch(displayName: str, screenreader: str, gender) -> int:
     """Returns the speech synthesis pitch for the given name
     """
     random.seed(displayName)
+    rangeMin = 1
+    rangeMax = 100
+    if 'She' in gender:
+        rangeMin = 50
+    elif 'Him' in gender:
+        rangeMax = 50
     if screenreader == 'picospeaker':
-        return random.randint(-8, 3)
+        rangeMin = -8
-    return random.randint(1, 100)
+        rangeMax = 3
+        if 'She' in gender:
+            rangeMin = -1
+        elif 'Him' in gender:
+            rangeMax = -1
+    return random.randint(rangeMin, rangeMax)
 
 
 def getSpeakerRate(displayName: str, screenreader: str) -> int:

translations/zh.json

@@ -382,7 +382,7 @@
     "sad face": "悲伤的脸",
     "thinking emoji": "思维表情符号",
     "laughing": "笑",
-    "gender": "",
+    "gender": "性别",
-    "He/Him": "",
+    "He/Him": "他",
-    "She/Her": ""
+    "She/Her": "她"
 }