浏览代码

fix brain include. must not be a list

nico 8 年之前
父节点
当前提交
76b95866dc
共有 3 个文件被更改,包括 22 次插入20 次删除
  1. 13 13
      brain.yml
  2. 1 4
      core/ConfigurationManager/BrainLoader.py
  3. 8 3
      test.py

+ 13 - 13
brain.yml

@@ -1,15 +1,15 @@
 ---
 
-#  - !include brains/ansible_playbook.yml
-#  - !include brains/gmail_checker.yml
-#  - !include brains/kill_switch.yml
-#  - !include brains/openweathermap.yml
-#  - !include brains/push_message.yml
-#  - !include brains/say.yml
-#  - !include brains/script.yml
-#  - !include brains/shell.yml
-#  - !include brains/systemdate.yml
-#  - !include brains/tasker_autoremote.yml
-#  - !include brains/wake_on_lan.yml
-#  - !include brains/twitter.yml
-  - !include brains/neurotransmitter.yml
+  !include brains/ansible_playbook.yml
+  !include brains/gmail_checker.yml
+  !include brains/kill_switch.yml
+  !include brains/openweathermap.yml
+  !include brains/push_message.yml
+  !include brains/say.yml
+  !include brains/script.yml
+  !include brains/shell.yml
+  !include brains/systemdate.yml
+  !include brains/tasker_autoremote.yml
+  !include brains/wake_on_lan.yml
+  !include brains/twitter.yml
+  !include brains/neurotransmitter.yml

+ 1 - 4
core/ConfigurationManager/BrainLoader.py

@@ -41,10 +41,7 @@ class BrainLoader(object):
         # create list of Synapse
         synapses = list()
         for synapses_dict in dict_brain:
-            # print synapses_dict
-            # if the synapse is a list, it come from an include
-            if isinstance(synapses_dict, list):
-                synapses_dict = synapses_dict[0]
+            print synapses_dict
             if ConfigurationChecker().check_synape_dict(synapses_dict):
                 # print "synapses_dict ok"
                 name = synapses_dict["name"]

+ 8 - 3
test.py

@@ -24,10 +24,15 @@ logger.setLevel(logging.DEBUG)
 SettingLoader.get_settings()
 
 # order = "pose moi une question"
-order = "synapse2"
-oa = OrderAnalyser(order=order)
+# order = "synapse2"
+# oa = OrderAnalyser(order=order)
+#
+# oa.start()
+
+brain = BrainLoader.get_brain()
 
-oa.start()
+for el in brain.synapses:
+    print el.name