Merge 9b28b31 into 5a0b42e

michaelDCurran · web-flow · commit d9c9cba4ef7d · 2019-10-25T15:28:48.000+10:00
diff --git a/source/speechDictHandler/__init__.py b/source/speechDictHandler/__init__.py
@@ -47,6 +47,8 @@ def sub(self, text):
 
 class SpeechDict(list):
 
+	fileName = None
+
 	def load(self, fileName):
 		self.fileName=fileName
 		comment=""
@@ -98,8 +100,16 @@ def save(self,fileName=None):
 		file.close()
 
 	def sub(self, text):
-		for entry in self:
-			text = entry.sub(text)
+		invalidEntries=[]
+		for index,entry in enumerate(self):
+			try:
+				text = entry.sub(text)
+			except re.error as exc:
+				dictName=self.fileName or "temporary dictionary"
+				log.error(f"Invalid dictionary entry {index+1} in {dictName}: \"{entry.pattern}\", {exc}") 
+				invalidEntries.append(index)
+			for index in reversed(invalidEntries):
+				del self[index]
 		return text
 
 def processText(text):
