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

#498 Automatically load data files #499

Merged
merged 3 commits into from
Feb 10, 2017
Merged

#498 Automatically load data files #499

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e46135
Load skill data nicely without throwing exceptions
forslund Feb 4, 2017
476c302
Load data files from skill directory when loading skill.
forslund Feb 7, 2017
6fc9233
Remove load_data_files(...) from all skills where applicable
forslund Feb 10, 2017
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
13 changes: 10 additions & 3 deletions mycroft/skills/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ def load_skill(skill_descriptor, emitter):
# v2 skills framework
skill = skill_module.create_skill()
skill.bind(emitter)
skill.load_data_files(dirname(skill_descriptor['info'][1]))
skill.initialize()
return skill
else:
Expand Down Expand Up @@ -261,8 +262,11 @@ def speak_dialog(self, key, data={}):
self.speak(self.dialog_renderer.render(key, data))

def init_dialog(self, root_directory):
self.dialog_renderer = DialogLoader().load(
join(root_directory, 'dialog', self.lang))
dialog_dir = join(root_directory, 'dialog', self.lang)
if os.path.exists(dialog_dir):
self.dialog_renderer = DialogLoader().load(dialog_dir)
else:
logger.error('No dialog loaded, ' + dialog_dir + ' does not exist')

def load_data_files(self, root_directory):
self.init_dialog(root_directory)
Expand All @@ -272,7 +276,10 @@ def load_data_files(self, root_directory):
self.load_regex_files(regex_path)

def load_vocab_files(self, vocab_dir):
load_vocabulary(vocab_dir, self.emitter)
if os.path.exists(vocab_dir):
load_vocabulary(vocab_dir, self.emitter)
else:
logger.error('No vocab loaded, ' + vocab_dir + ' does not exist')

def load_regex_files(self, regex_dir):
load_regex(regex_dir, self.emitter)
Expand Down