소스 검색

remove all get_brain access.

nico 8 년 전
부모
커밋
fc2b4a3088
3개의 변경된 파일6개의 추가작업 그리고 12개의 파일을 삭제
  1. 2 2
      core/CrontabManager.py
  2. 2 8
      core/MainController.py
  3. 2 2
      kalliope.py

+ 2 - 2
core/CrontabManager.py

@@ -19,9 +19,9 @@ KALLIOPE_ENTRY_POINT_SCRIPT = "kalliope.py"
 
 class CrontabManager:
 
-    def __init__(self, brain_file=None):
+    def __init__(self, brain=None):
         self.my_user_cron = CronTab(user=True)
-        self.brain = BrainLoader.get_brain(file_path=brain_file)
+        self.brain = brain
         self.base_command = self._get_base_command()
 
     def load_events_in_crontab(self):

+ 2 - 8
core/MainController.py

@@ -18,17 +18,11 @@ logger = logging.getLogger("kalliope")
 
 
 class MainController:
-    def __init__(self, brain_file=None):
-        self.brain_file = brain_file
+    def __init__(self, brain=None):
+        self.brain = brain
         # get global configuration
         self.settings = SettingLoader.get_settings()
 
-        # load the brain
-        if brain_file is None:
-            self.brain = BrainLoader.get_brain()
-        else:
-            self.brain = BrainLoader.get_brain(file_path=brain_file)
-
         # run the api if the user want it
         if self.settings.rest_api.active:
             Utils.print_info("Starting REST API Listening port: %s" % self.settings.rest_api.port)

+ 2 - 2
kalliope.py

@@ -69,7 +69,7 @@ def main():
 
         if args.run_synapse is None:
             # first, load events in crontab
-            crontab_manager = CrontabManager(brain_file=brain_file)
+            crontab_manager = CrontabManager(brain=brain)
             crontab_manager.load_events_in_crontab()
             Utils.print_success("Events loaded in crontab")
             # then start kalliope
@@ -78,7 +78,7 @@ def main():
             # catch signal for killing on Ctrl+C pressed
             signal.signal(signal.SIGINT, signal_handler)
             # start the main controller
-            MainController(brain_file=brain_file)
+            MainController(brain=brain)
 
     if args.action == "gui":
         ShellGui(brain=brain)