Changeset 2351

Timestamp:

08/19/08 12:17:15 (3 months ago)

Author:

pvagner

Message:

* speechDicts: fixing a problem where NVDA was unable to save dictionary entries for particular voices. Thanks Moodley, Deenadayalan

Location:

trunk/source

Files:

• api.py (modified) (1 diff)
• speechDictHandler.py (modified) (2 diffs)

trunk/source/api.py

@@ -268 +268 @@
                 text = ""
         return text + " ".join(chunk for child in obj.children for chunk in (child.name, child.value) if chunk and isinstance(chunk, basestring) and not chunk.isspace())
+
+def validateFile(name):
+        """Replaces invalid characters in a given string to make a windows compatible filename.
+@returns: A string holding altered name.
+@rtype: string
+@param name: text to makea file name of
+@type text: string
+"""
+        invalidChars=':?*\|<>/"'
+        for c in invalidChars:
+                name=name.replace(c,'_')
+        return name

trunk/source/speechDictHandler.py

@@ -11 +11 @@
 import codecs
 import synthDriverHandler
+import api
 
 dictionaries = {}
@@ -91 +92 @@
         elif type is "voice":
                 s=synthDriverHandler.getSynth()
-                return "%s/%s-%s.dic"%(speechDictsPath,s.name,s.getVoiceName(s.voice))
+                return "%s/%s-%s.dic"%(speechDictsPath,api.validateFile(s.name),validateFile(s.getVoiceName(s.voice)))
         return None