Skip to content
This repository has been archived by the owner on Sep 8, 2024. It is now read-only.

Fix Mimic 2 cache directory error #2800

Merged
merged 3 commits into from
Jan 15, 2021
Merged

Fix Mimic 2 cache directory error #2800

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91b1a9a
Fixed an error that occurs when the pre-loaded cache directory alread…
chrisveilleux Jan 14, 2021
a52d45f
Re-added argument removed in previous commit to preserve backwards co…
chrisveilleux Jan 14, 2021
042a238
Don't build the cache directory if it already exists.
chrisveilleux Jan 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions mycroft/tts/cache_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,29 @@ def generate_cache_text(cache_audio_dir, cache_text_file):
from *.dialog files present in
mycroft/res/text/en-us and mycroft-wifi setup skill
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
"""
# 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"
)
os.makedirs(cache_audio_dir)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to check if this directory exists before making it?

try:
if not os.path.isfile(cache_text_file):
os.makedirs(cache_audio_dir)
f = open(cache_text_file, 'w')
text_file = open(cache_text_file, 'w')
for each_path in cache_dialog_path:
if os.path.exists(each_path):
write_cache_text(each_path, f)
f.close()
write_cache_text(each_path, text_file)
text_file.close()
LOG.debug("Completed generating cache")
else:
LOG.debug("Cache file 'cache_text.txt' already exists")
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):
Expand Down Expand Up @@ -172,8 +179,11 @@ def copy_cache(cache_audio_dir):
def main(cache_audio_dir):
# Path where cache is stored and not cleared on reboot/TTS change
if cache_audio_dir:
cache_text_file = os.path.join(cache_audio_dir,
'..', 'cache_text.txt')
generate_cache_text(cache_audio_dir, cache_text_file)
download_audio(cache_audio_dir, cache_text_file)
if not os.path.exists(cache_audio_dir):
os.makedirs(cache_audio_dir)
cache_text_dir = os.path.dirname(cache_audio_dir)
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)