|
@@ -144,37 +144,44 @@ class NeuronModule(object):
|
|
|
"""
|
|
|
returned_message = None
|
|
|
|
|
|
- if (self.say_template is not None and self.file_template is None) or \
|
|
|
- (self.say_template is None and self.file_template is not None):
|
|
|
-
|
|
|
-
|
|
|
- if self.say_template is not None:
|
|
|
- if isinstance(self.say_template, list):
|
|
|
-
|
|
|
- self.say_template = random.choice(self.say_template)
|
|
|
- t = Template(self.say_template)
|
|
|
- returned_message = t.render(**message_dict)
|
|
|
-
|
|
|
-
|
|
|
- reload(sys)
|
|
|
- sys.setdefaultencoding('utf-8')
|
|
|
-
|
|
|
- if self.file_template is not None:
|
|
|
- real_file_template_path = Utils.get_real_file_path(self.file_template)
|
|
|
-
|
|
|
- if os.path.isfile(real_file_template_path):
|
|
|
-
|
|
|
- t = Template(self._get_content_of_file(real_file_template_path))
|
|
|
- returned_message = t.render(**message_dict)
|
|
|
- else:
|
|
|
- raise TemplateFileNotFoundException("Template file %s not found in templates folder"
|
|
|
- % real_file_template_path)
|
|
|
- return returned_message
|
|
|
+
|
|
|
+ if self.say_template is not None:
|
|
|
+ returned_message = self._get_say_template(self.say_template, message_dict)
|
|
|
+
|
|
|
+
|
|
|
+ reload(sys)
|
|
|
+ sys.setdefaultencoding('utf-8')
|
|
|
+
|
|
|
+
|
|
|
+ if self.file_template is not None:
|
|
|
+ returned_message = self._get_file_template(self.file_template, message_dict)
|
|
|
+
|
|
|
+ return returned_message
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
+ @staticmethod
|
|
|
+ def _get_say_template(list_say_template, message_dict):
|
|
|
+ if isinstance(list_say_template, list):
|
|
|
+
|
|
|
+ list_say_template = random.choice(list_say_template)
|
|
|
+ t = Template(list_say_template)
|
|
|
+ return t.render(**message_dict)
|
|
|
+
|
|
|
+ @classmethod
|
|
|
+ def _get_file_template(cls, file_template, message_dict):
|
|
|
+ real_file_template_path = Utils.get_real_file_path(file_template)
|
|
|
+ if os.path.isfile(real_file_template_path):
|
|
|
+
|
|
|
+ t = Template(cls._get_content_of_file(real_file_template_path))
|
|
|
+ returned_message = t.render(**message_dict)
|
|
|
+ else:
|
|
|
+ raise TemplateFileNotFoundException("Template file %s not found in templates folder"
|
|
|
+ % real_file_template_path)
|
|
|
+ return returned_message
|
|
|
+
|
|
|
def run_synapse_by_name(self, name):
|
|
|
SynapseLauncher.start_synapse(name=name, brain=self.brain)
|
|
|
|