import from latest OPM/ovos_utils

Author: JarbasAl

ovos_plugin_manager/templates/tts.py

@@ -217,7 +217,9 @@ def __init__(self, lang="en-us", config=None, validator=None,
         self.log_timestamps = self.config.get("log_timestamps", False)
 
         self.voice = self.config.get("voice")
-        self.filename = get_temp_path('tts.' + self.audio_ext)
+        # TODO can self.filename be deprecated ? is it used anywhere at all?
+        cache_dir = get_cache_directory(self.tts_name)
+        self.filename = join(cache_dir, 'tts.' + self.audio_ext)
         self.enclosure = None
         random.seed()
         self.queue = Queue()
@@ -405,13 +407,16 @@ def execute(self, sentence, ident=None, listen=False, **kwargs):
             # Re-raise to allow the Exception to be handled externally as well.
             raise
 
-    def _execute(self, sentence, ident, listen, **kwargs):
+    def _replace_phonetic_spellings(self, sentence):
         if self.phonetic_spelling:
             for word in re.findall(r"[\w']+", sentence):
                 if word.lower() in self.spellings:
-                    sentence = sentence.replace(word,
-                                                self.spellings[word.lower()])
+                    spelled = self.spellings[word.lower()]
+                    sentence = sentence.replace(word, spelled)
+        return sentence
 
+    def _execute(self, sentence, ident, listen, **kwargs):
+        sentence = self._replace_phonetic_spellings(sentence)
         chunks = self._preprocess_sentence(sentence)
         # Apply the listen flag to the last chunk, set the rest to False
         chunks = [(chunks[i], listen if i == len(chunks) - 1 else False)
@@ -456,7 +461,7 @@ def _synth(self, sentence_hash, sentence, **kwargs):
         # NOTE: this is ovos only functionality, not in mycroft-core!
         lang = kwargs.get("lang")
         if not lang and kwargs.get("message"):
-            # some plugins accept a message object
+            # get lang from message object if possible
             try:
                 lang = kwargs["message"].data.get("lang") or \
                        kwargs["message"].context.get("lang")