Переглянути джерело

add output in console, remove unused print

nico 8 роки тому
батько
коміт
9aade64dac
6 змінених файлів з 9 додано та 23 видалено
  1. 0 1
      brain.yml
  2. 7 0
      core/MainController.py
  3. 2 4
      core/OrderAnalyser.py
  4. 0 1
      core/__init__.py
  5. 0 15
      test.py
  6. 0 2
      trigger/snowboy/snowboy.py

+ 0 - 1
brain.yml

@@ -4,7 +4,6 @@
       - say:
           message:
             - "Bonjour monsieur"
-      - kill_switch
     signals:
       - event: "57 22 * * *"
       - order: "dis bonjour"

+ 7 - 0
core/MainController.py

@@ -1,3 +1,4 @@
+from core import Utils
 from core.ConfigurationManager import SettingLoader
 from core.OrderAnalyser import OrderAnalyser
 from core.OrderListener import OrderListener
@@ -17,6 +18,7 @@ class MainController:
         # Wait that the jarvis trigger is pronounced by the user
         self.trigger_instance = self._get_default_trigger()
         self.trigger_instance.start()
+        Utils.print_info("Waiting for trigger detection")
 
     def callback(self):
         """
@@ -37,6 +39,7 @@ class MainController:
         order_analyser = OrderAnalyser(order, main_controller=self, brain_file=self.brain_file)
         order_analyser.start()
         # restart the trigger when the order analyser has finish his job
+        Utils.print_info("Waiting for trigger detection")
         self.trigger_instance.unpause()
 
     def _get_default_trigger(self):
@@ -47,3 +50,7 @@ class MainController:
         for trigger in self.settings.triggers:
             if trigger.name == self.settings.default_trigger_name:
                 return TriggerLauncher.get_trigger(trigger, callback=self.callback)
+
+    def unpause_jarvis_trigger(self):
+        print "call unpause"
+        self.trigger_instance.unpause()

+ 2 - 4
core/OrderAnalyser.py

@@ -32,16 +32,14 @@ class OrderAnalyser:
             for signal in synapse.signals:
                 if type(signal) == Order:
                     if self._spelt_order_match_brain_order(signal.sentence):
+                        synapses_found = True
                         logger.debug("Order found! Run neurons: %s" % synapse.neurons)
-                        Utils.print_success("Order matched in the brain. Running synapse %s" % synapse.name)
+                        Utils.print_success("Order matched in the brain. Running synapse \"%s\"" % synapse.name)
                         for neuron in synapse.neurons:
                             NeuroneLauncher.start_neurone(neuron)
 
         if not synapses_found:
             Utils.print_info("No synapse match the captured order: %s" % self.order)
-        # once we ran all plugin, we can start back jarvis trigger
-        if self.main_controller is not None:
-            self.main_controller.unpause_jarvis_trigger()
 
     def _spelt_order_match_brain_order(self, order_to_test):
         """

+ 0 - 1
core/__init__.py

@@ -1,4 +1,3 @@
-from core.JarvisTrigger import JarvisTrigger
 from core.OrderAnalyser import OrderAnalyser
 from core.OrderListener import OrderListener
 from core.AudioPlayer import AudioPlayer

+ 0 - 15
test.py

@@ -19,21 +19,6 @@ logger = logging.getLogger("jarvis")
 #
 # oa.start()
 
-# cmd = "python jarvis.py start --run-synapse \"say hello\" --brain-file /home/nico/Documents/jarvis/test.yml"
-#
-# os.system(cmd)
-
-# crontab_manager = CrontabManager(brain_file="/home/nico/Documents/jarvis/test.yml")
-# crontab_manager.load_events_in_crontab()
-
-
-def callback():
-    print "callback called"
-
 
-settings = SettingLoader.get_settings()
 
 
-for trigger in settings.triggers:
-    if trigger.name == settings.default_trigger_name:
-        TriggerLauncher.start_trigger(trigger, callback=callback)

+ 0 - 2
trigger/snowboy/snowboy.py

@@ -8,7 +8,6 @@ class MissingParameterException(Exception):
 class Snowboy(object):
 
     def __init__(self, **kwargs):
-        print "loaded"
         # pause listening boolean
         self.interrupted = False
 
@@ -35,7 +34,6 @@ class Snowboy(object):
         Start the snowboy thread and wait for a Jarvis trigger word
         :return:
         """
-        print "started"
         detector = snowboydecoder.HotwordDetector(self.pmdl, sensitivity=0.5)
 
         # start snowboy loop