Fixed a bug that required the -f flag in conjunction with -e to use pty.

config/settings/settings.conf

@@ -33,14 +33,11 @@ genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine
 enabled=True
 
 # Select speech driver, options are speechdDriver or genericDriver:
-#driver=speechdDriver
-driver=genericDriver
-
-# server path for emacspeak
-# serverPath=
+driver=speechdDriver
+#driver=genericDriver
 
 # The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
-rate=0.65
+rate=0.5
 
 # Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
 pitch=0.5

src/fenrir

@@ -98,7 +98,7 @@ def main():
         argumentParser.error(errorMsg)
         sys.exit(1)
 
-    if cliArgs.foreground:
+    if cliArgs.foreground or cliArgs.emulated_pty:
         # Run directly in foreground
         run_fenrir()
     else:

src/fenrirscreenreader/fenrirVersion.py

@@ -4,5 +4,5 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-version = "2024.12.10"
-codeName = "stable"
+version = "2024.12.15"
+codeName = "testing"

src/fenrirscreenreader/speechDriver/emacspeakDriver.py

@@ -1,70 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-# generic driver
-
-import pexpect
-import shlex
-import time
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.core.speechDriver import speechDriver
-
-class driver(speechDriver):
-    def __init__(self):
-        speechDriver.__init__(self)
-    def initialize(self, environment):
-        self.env = environment
-        try:
-            self.server = pexpect.spawn('tclsh ' + self.env['runtime']['settingsManager'].getSetting('speech', 'serverPath'))
-            self._isInitialized = True
-        except Exception as e:
-            self.env['runtime']['debug'].writeDebugOut('speechDriver:initialize:' + str(e),debug.debugLevel.ERROR)
-
-    def shutdown(self):
-        if self.server:
-            try:
-                self.server.terminate()
-            except Exception as e:
-                self.env['runtime']['debug'].writeDebugOut('speechDriver:shutdown:self.server.terminate():' + str(e),debug.debugLevel.ERROR)
-
-    def speak(self,text, queueable=True):
-        if not self._isInitialized:
-            return
-        if not queueable: 
-            self.cancel()
-        try:
-            cleanText = text
-            for c in '[]{}\\|_@#^*<>\"`~^':
-                cleanText.replace(c,'')
-            cleanText = shlex.split(cleanText)
-            for idx, word in enumerate(cleanText):
-                cleanText[idx] = word
-            cleanText = ' '.join(cleanText)
-            cleanText = 'tts_say \"' + cleanText +'\"'
-            self.server.sendline(cleanText) 
-        except Exception as e:
-            self.env['runtime']['debug'].writeDebugOut('speechDriver:speak:self.server.sendline():' + str(e),debug.debugLevel.ERROR)
-    
-    def cancel(self):
-        if not self._isInitialized:
-            return
-        try:
-            self.server.sendline('stop')
-        except Exception as e:
-            print(e)
-            self.env['runtime']['debug'].writeDebugOut('speechDriver:cancel:self.server.sendline():' + str(e),debug.debugLevel.ERROR)
-    
-    def setRate(self, rate):
-        if not self._isInitialized:
-            return
-        try:
-            self.server.sendline('tts_set_speech_rate ' + str(int(rate * 400)))
-        except Exception as e:
-            self.env['runtime']['debug'].writeDebugOut('speechDriver:setRate:self.server.sendline():' + str(e),debug.debugLevel.ERROR)
-    
-    def setLanguage(self, language):
-        if not self._isInitialized:
-            return
-        self.server.sendline('set_lang ' + language)

src/fenrirscreenreader/speechDriver/pyttsxDriver.py

@@ -1,85 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-# Espeak driver
-
-from threading import Thread, Lock
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.core.speechDriver import speechDriver
-
-class driver(speechDriver):
-    def __init__(self):
-        speechDriver.__init__(self)
-        self._engine = None
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        if self._isInitialized:
-            self.cancel()
-            self._engine.endLoop()
-        self._initialized = False
-    def eventLoop(self):
-        self._engine.startLoop()
-    def startEngine(self):
-        try:
-            import pyttsx3
-            if self.module != '':
-                self._engine = pyttsx3.init(self.module)
-            else:
-                self._engine = pyttsx3.init()
-            self.eventLoopThread = Thread(target=self.eventLoop)
-            self._isInitialized = True
-            self.eventLoopThread.start()
-        except Exception as e:
-            self.env['runtime']['debug'].writeDebugOut('SpeechDriver:initialize:' + str(e),debug.debugLevel.ERROR)
-    
-    def speak(self,text, interrupt=True):
-        if not self._isInitialized:
-            self.startEngine()
-            if not self._isInitialized:
-                return
-        if not interrupt:
-            self.cancel()
-        try:
-            self._engine.setProperty('volume', self.volume) 
-        except Exception as e:
-            self.env['runtime']['debug'].writeDebugOut('SpeechDriver:speak:volume:' + str(e),debug.debugLevel.ERROR) 
-        try:
-            self._engine.setProperty('rate', self.rate) 
-        except Exception as e:
-            self.env['runtime']['debug'].writeDebugOut('SpeechDriver:speak:rate:' + str(e),debug.debugLevel.ERROR) 
-        try:
-            self._engine.setProperty('pitch', self.pitch)
-        except Exception as e:
-            self.env['runtime']['debug'].writeDebugOut('SpeechDriver:speak:pitch:' + str(e),debug.debugLevel.ERROR)
-        if self.language != None:
-            if self.language != '':
-                try:
-                    self._engine.setProperty('voice', self.language)
-                except Exception as e:
-                    self.env['runtime']['debug'].writeDebugOut('SpeechDriver:speak:language:' + str(e),debug.debugLevel.ERROR)
-
-        elif self.voice != None:
-            if self.voice != '':
-                try:
-                    self._engine.setProperty('voice', self.voice) 
-                except Exception as e:
-                    self.env['runtime']['debug'].writeDebugOut('SpeechDriver:speak:voice:' + str(e),debug.debugLevel.ERROR)
-        self._engine.say(text)
-
-    def cancel(self):
-        if not self._isInitialized:
-            return
-        self._engine.stop()
-
-    def setPitch(self, pitch):
-        if not self._isInitialized:
-            return
-        self.pitch = pitch
-        
-    def setRate(self, rate):
-        if not self._isInitialized:
-            return
-        self.rate = rate