indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Tidying

merge-requests/30/head
Bob Mottram 2021-03-10 12:11:42 +00:00
parent b2e974ffce
commit 411c5f7f0d
1 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
notifications_client.py
View File

@ -98,25 +98,38 @@ def _desktopNotification(notificationType: str,
title + "\", '" + message + "'") title + "\", '" + message + "'")
def _sayCommand(sayStr: str, screenreader: str, def _textToSpeech(sayStr: str, screenreader: str,
pitch: int, rate: int, srange: int,
systemLanguage: str, espeak=None) -> None: systemLanguage: str, espeak=None) -> None:
"""Say something via TTS
"""
# speak the post content
if screenreader == 'espeak':
_speakerEspeak(espeak, pitch, rate, srange, sayStr)
elif screenreader == 'picospeaker':
_speakerPicospeaker(pitch, rate,
systemLanguage, sayStr)
def _sayCommand(sayStr: str, screenreader: str,
systemLanguage: str,
espeak=None,
speakerName='screen reader',
speakerGender='They/Them') -> None:
"""Speaks a command """Speaks a command
""" """
print(sayStr) print(sayStr)
if not screenreader: if not screenreader:
return return
cmdSpeakerName = 'screen reader' pitch = getSpeakerPitch(speakerName,
pitch = getSpeakerPitch(cmdSpeakerName, screenreader, speakerGender)
screenreader, 'They/Them') rate = getSpeakerRate(speakerName, screenreader)
rate = getSpeakerRate(cmdSpeakerName, screenreader) srange = getSpeakerRange(speakerName)
srange = getSpeakerRange(cmdSpeakerName)
if screenreader == 'espeak': _textToSpeech(sayStr, screenreader,
_speakerEspeak(espeak, pitch, rate, srange, sayStr) pitch, rate, srange,
elif screenreader == 'picospeaker': systemLanguage, espeak)
_speakerPicospeaker(pitch, rate,
systemLanguage, sayStr)
def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str, def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
@ -256,20 +269,6 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
if speakerJson.get('gender'): if speakerJson.get('gender'):
gender = speakerJson['gender'] gender = speakerJson['gender']
# get the speech parameters
pitch = getSpeakerPitch(nameStr, screenreader, gender)
rate = getSpeakerRate(nameStr, screenreader)
srange = getSpeakerRange(nameStr)
# say the speaker's name
if screenreader == 'espeak':
_speakerEspeak(espeak, pitch, rate, srange,
nameStr)
elif screenreader == 'picospeaker':
_speakerPicospeaker(pitch, rate,
systemLanguage, nameStr)
time.sleep(2)
# append image description if needed # append image description if needed
if not speakerJson.get('imageDescription'): if not speakerJson.get('imageDescription'):
sayStr = speakerJson['say'] sayStr = speakerJson['say']
@ -288,12 +287,17 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
html.unescape(speakerJson['say']) + html.unescape(speakerJson['say']) +
'\n' + imageDescription) '\n' + imageDescription)
# say the speaker's name
_sayCommand(nameStr, screenreader,
systemLanguage, espeak,
nameStr, gender)
time.sleep(2)
# speak the post content # speak the post content
if screenreader == 'espeak': _sayCommand(sayStr, screenreader,
_speakerEspeak(espeak, pitch, rate, srange, sayStr) systemLanguage, espeak,
elif screenreader == 'picospeaker': nameStr, gender)
_speakerPicospeaker(pitch, rate,
systemLanguage, sayStr)
prevSay = speakerJson['say'] prevSay = speakerJson['say']