Refactor VoiceManager code

Author: tsengwoody

addon/globalPlugins/WorldVoice/speechSettingsDialog.py

@@ -84,9 +84,9 @@ def makeSettings(self, sizer):
 		else:
 			self._manager.activeEngines = [key for key, value in config.conf["WorldVoice"]["engine"].items() if value]
 
-		self._localeToVoices = self._manager.localeToVoicesMapEngineFilter
-		self.localesToNames = self._manager.localesToNamesMapEngineFilter
-		self._locales = self._manager.languagesEngineFilter
+		self._localeToVoices = self._manager.localeToVoicesMap
+		self.localesToNames = self._manager.localesToNamesMap
+		self._locales = self._manager.languages
 
 		self._dataToPercist = defaultdict(lambda: {})
 		latinSet = set(languageDetection.ALL_LATIN) & set(l for l in self._locales if len(l) == 2)
@@ -246,9 +246,9 @@ def onKeepEngineConsistentChange(self, event):
 
 		self._manager.onKeepEngineConsistent()
 
-		self._localeToVoices = self._manager.localeToVoicesMapEngineFilter
-		self.localesToNames = self._manager.localesToNamesMapEngineFilter
-		self._locales = self._manager.languagesEngineFilter
+		self._localeToVoices = self._manager.localeToVoicesMap
+		self.localesToNames = self._manager.localesToNamesMap
+		self._locales = self._manager.languages
 		self._localesChoice.SetItems([self.localesToNames[l] for l in self._locales])
 		self._updateVoicesSelection()
 
@@ -407,8 +407,8 @@ def makeSettings(self, sizer):
 			sizer.Add(infoLabel)
 			return
 
-		self.localesToNames = self._manager.localesToNamesMapEngineFilter
-		self._locales = self._manager.languagesEngineFilter
+		self.localesToNames = self._manager.localesToNamesMap
+		self._locales = self._manager.languages
 
 		settingsSizerHelper = guiHelper.BoxSizerHelper(self, sizer=sizer)
 		latinSet = set(languageDetection.ALL_LATIN) & set(l for l in self._locales if len(l) == 2)
@@ -499,6 +499,10 @@ class SpeechEngineSettingsPanel(BaseSettingsPanel):
 	# Translators: Title of a setting dialog.
 	title = _("Speech Engine")
 	settings = OrderedDict({
+		"VE": {
+			# Translators: The label of an option in the Engine settings dialog
+			"label": _("Activate VE")
+		},
 		"OneCore": {
 			# Translators: The label of an option in the Engine settings dialog
 			"label": _("Activate OneCore")
@@ -549,6 +553,8 @@ def onSave(self):
 			)
 			return False
 
+		print(activeEngine)
+		print(self.previousActiveEngine)
 		if activeEngine != self.previousActiveEngine:
 			if gui.messageBox(
 				# Translators: The message displayed

addon/synthDrivers/WorldVoice/__init__.py

@@ -93,7 +93,7 @@ class SynthDriver(SynthDriver):
 
 	@classmethod
 	def check(cls):
-		return VoiceManager.ready()
+		return True
 
 	@property
 	def supportedSettings(self):

addon/synthDrivers/WorldVoice/voiceManager.py

@@ -57,22 +57,23 @@ class VoiceManager(object):
 
 	@classmethod
 	def ready(cls):
-		result = False
-		for item in cls.voice_class.values():
-			result |= item.ready()
-		return result
+		return True
 
 	def __init__(self):
 		self.lock = threading.Lock()
 
+		self.activeEngines = [key for key, value in config.conf["WorldVoice"]["engine"].items() if value]
 		self.installEngine = []
-		for item in self.voice_class.values():
+		for key in self.activeEngines:
+			try:
+				item = self.voice_class[key]
+			except BaseException as e:
+				continue
 			if item.ready():
 				try:
 					item.engineOn(self.lock)
 					self.installEngine.append(item)
 				except BaseException as e:
-					print(e)
 					pass
 
 		self._setVoiceDatas()
@@ -90,8 +91,6 @@ def __init__(self):
 				config.conf["WorldVoice"]["engine"]["SAPI5"] = True
 				item = self.table[0]
 
-		self.activeEngines = [key for key, value in config.conf["WorldVoice"]["engine"].items() if value]
-
 		defaultVoiceName = item["name"]
 		self._defaultVoiceInstance = self.getVoiceInstance(defaultVoiceName)
 		self._defaultVoiceInstance.loadParameter()
@@ -179,7 +178,7 @@ def onKeepEngineConsistent(self):
 
 		for localelo, data in config.conf["WorldVoice"]['speechRole'].items():
 			if isinstance(data, config.AggregatedSection):
-				if (localelo not in self.localeToVoicesMapEngineFilter) or ('voice' in data and data['voice'] not in self.localeToVoicesMapEngineFilter[localelo]):
+				if (localelo not in self.localeToVoicesMap) or ('voice' in data and data['voice'] not in self.localeToVoicesMap[localelo]):
 					try:
 						del temp[localelo]
 					except BaseException:
@@ -225,7 +224,7 @@ def _setVoiceDatas(self):
 		for item in self.installEngine:
 			self.table.extend(item.voices())
 		self.table = sorted(self.table, key=lambda item: (item['engine'], item['language'], item['name']))
-		self.table = list(filter(lambda item: item['engine'] in [key for key, value in config.conf["WorldVoice"]["engine"].items() if value], self.table))
+		self.table = list(filter(lambda item: item['engine'] in self.activeEngines, self.table))
 
 		self._localesToVoices = {
 			**groupByField(self.table, 'locale', lambda i: i, lambda i: i['name']),
@@ -244,44 +243,15 @@ def _setVoiceDatas(self):
 		# Kepp a list with existing voices in VoiceInfo objects.
 		self._voiceInfos = OrderedDict([(v.id, v) for v in voiceInfos])
 
-	def _setVoiceDatasEngineFilter(self):
-		self.tableEngineFilter = []
-		for item in self.voice_class.values():
-			self.tableEngineFilter.extend(item.voices())
-		self.tableEngineFilter = sorted(self.tableEngineFilter, key=lambda item: (item['engine'], item['language'], item['name']))
-		self.tableEngineFilter = list(filter(lambda item: item['engine'] in self.engines, self.tableEngineFilter))
-
-		self._localesToVoicesEngineFilter = {
-			**groupByField(self.tableEngineFilter, 'locale', lambda i: i, lambda i: i['name']),
-			# For locales with no country (i.g. "en") use all voices from all sub-locales
-			**groupByField(self.tableEngineFilter, 'locale', lambda i: i.split('_')[0], lambda i: i['name']),
-		}
-
-		self._voicesToEnginesEngineFilter = {}
-		for item in self.tableEngineFilter:
-			self._voicesToEnginesEngineFilter[item["name"]] = item["engine"]
-
-		voiceInfos = []
-		for item in self.tableEngineFilter:
-			voiceInfos.append(VoiceInfo(item["name"], item["description"], item["language"]))
-
-		# Kepp a list with existing voices in VoiceInfo objects.
-		self._voiceInfosEngineFilter = OrderedDict([(v.id, v) for v in voiceInfos])
-
 	@property
 	def activeEngines(self):
 		return self._activeEngines
 
 	@activeEngines.setter
 	def activeEngines(self, value):
-		if not set(value).issubset(set(self.voice_class.keys())):
-			raise ValueError("engine setted is not valid")
+		# if not set(value).issubset(set(self.voice_class.keys())):
+			# raise ValueError("engine setted is not valid")
 		self._activeEngines = value
-		self._setVoiceDatasEngineFilter()
-
-	@property
-	def engines(self):
-		return self.activeEngines
 
 	@property
 	def voiceInfos(self):
@@ -299,18 +269,6 @@ def localeToVoicesMap(self):
 	def localesToNamesMap(self):
 		return {item: self._getLocaleReadableName(item) for item in self._localesToVoices}
 
-	@property
-	def languagesEngineFilter(self):
-		return sorted([l for l in self._localesToVoicesEngineFilter if len(self._localesToVoicesEngineFilter[l]) > 0])
-
-	@property
-	def localeToVoicesMapEngineFilter(self):
-		return self._localesToVoicesEngineFilter.copy()
-
-	@property
-	def localesToNamesMapEngineFilter(self):
-		return {locale: self._getLocaleReadableName(locale) for locale in self._localesToVoicesEngineFilter}
-
 	def getVoiceNameForLanguage(self, language):
 		configured = self._getConfiguredVoiceNameForLanguage(language)
 		if configured is not None and configured in self.voiceInfos:

buildVars.py

@@ -25,7 +25,7 @@ def _(arg):
 	# Translators: Long description to be shown for this add-on on add-on information from add-ons manager
 	"addon_description" : _("Multilingual synthesizers add-on: Automatically switch speech role according to text language; Integrated Espeak, OneCore, RHVoice, SAPI5, Piper speech engine"),
 	# version
-	"addon_version" : "2024.7.25",
+	"addon_version" : "4.1",
 	# Author(s)
 	"addon_author" : "Tseng Woody <tsengwoody.tw@gmail.com>",
 	# URL for the add-on documentation support
@@ -37,7 +37,7 @@ def _(arg):
 	# Minimum NVDA version supported (e.g. "2018.3.0", minor version is optional)
 	"addon_minimumNVDAVersion" : "2024.1",
 	# Last NVDA version supported/tested (e.g. "2018.4.0", ideally more recent than minimum version)
-	"addon_lastTestedNVDAVersion" : "2024.1",
+	"addon_lastTestedNVDAVersion" : "2024.4",
 	# Add-on update channel (default is None, denoting stable releases,
 	# and for development releases, use "dev".)
 	# Do not change unless you know what you are doing!