MycroftAI
/
mycroft-core
mirror of https://github.com/MycroftAI/mycroft-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2800 from MycroftAI/bugfix/mimic2-cache-dir 

Fix Mimic 2 cache directory error
pull/2807/head
Kris Gesling 2021-01-15 10:25:40 +09:30 committed by GitHub
parent 974be29c57 042a23879c
commit e69f3517c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mycroft/tts/cache_handler.py
View File

@ -51,22 +51,30 @@ def generate_cache_text(cache_audio_dir, cache_text_file):
from *.dialog files present in from *.dialog files present in
mycroft/res/text/en-us and mycroft-wifi setup skill mycroft/res/text/en-us and mycroft-wifi setup skill
Args: Args:
cache_audio_dir (path): path to store .wav files cache_audio_dir (path): DEPRECATED path to store .wav files
cache_text_file (file): file containing the sentences cache_text_file (file): file containing the sentences
""" """
# TODO: remove in 21.08
if cache_audio_dir is not None:
LOG.warning(
"the cache_audio_dir argument is deprecated. ensure the directory "
"exists before executing this function. support for this argument "
"will be removed in version 21.08"
)
if not os.path.exists(cache_audio_dir):
os.makedirs(cache_audio_dir)
try: try:
if not os.path.isfile(cache_text_file): if not os.path.isfile(cache_text_file):
os.makedirs(cache_audio_dir) text_file = open(cache_text_file, 'w')
f = open(cache_text_file, 'w')
for each_path in cache_dialog_path: for each_path in cache_dialog_path:
if os.path.exists(each_path): if os.path.exists(each_path):
write_cache_text(each_path, f) write_cache_text(each_path, text_file)
f.close() text_file.close()
LOG.debug("Completed generating cache") LOG.debug("Completed generating cache")
else: else:
LOG.debug("Cache file 'cache_text.txt' already exists") LOG.debug("Cache file 'cache_text.txt' already exists")
except Exception: except Exception:
LOG.error("Could not open text file to write cache") LOG.exception("Could not open text file to write cache")
def write_cache_text(cache_path, f): def write_cache_text(cache_path, f):
@ -172,8 +180,11 @@ def copy_cache(cache_audio_dir):
def main(cache_audio_dir): def main(cache_audio_dir):
# Path where cache is stored and not cleared on reboot/TTS change # Path where cache is stored and not cleared on reboot/TTS change
if cache_audio_dir: if cache_audio_dir:
cache_text_file = os.path.join(cache_audio_dir, if not os.path.exists(cache_audio_dir):
'..', 'cache_text.txt') os.makedirs(cache_audio_dir)
generate_cache_text(cache_audio_dir, cache_text_file) cache_text_dir = os.path.dirname(cache_audio_dir)
download_audio(cache_audio_dir, cache_text_file) cache_text_path = os.path.join(cache_text_dir, 'cache_text.txt')
# TODO: remove he first argument in 21.08
generate_cache_text(None, cache_text_path)
download_audio(cache_audio_dir, cache_text_path)
copy_cache(cache_audio_dir) copy_cache(cache_audio_dir)