Added CurveEngine.run_command and reorganized CommandStack._execute

[hooke.git] / hooke / hooke.py

diff --git a/hooke/hooke.py b/hooke/hooke.py
index 54f0f0fb695b7ec734f0ee91ff7d5d526b5d8f78..a8079a9a2e498ca19b0db75730ab4cd8bc202252 100644 (file)
--- a/hooke/hooke.py
+++ b/hooke/hooke.py
@@ -90,7 +90,7 @@ class Hooke (object):
         self.load_plugins()
         self.load_drivers()
         self.load_ui()
-        self.command = engine.CommandEngine()
+        self.engine = engine.CommandEngine()
         self.playlists = playlist.NoteIndexList()
 
     def load_log(self):
@@ -118,6 +118,16 @@ class Hooke (object):
     def close(self):
         self.config.write() # Does not preserve original comments
 
+    def run_command(self, command, arguments):
+        """Run `command` with `arguments` using
+        :meth:`~hooke.engine.CommandEngine.run_command`.
+
+        Allows for running commands without spawning another process
+        as in :class:`HookeRunner`.
+        """
+        self.engine.run_command(self, command, arguments)
+
+
 class HookeRunner (object):
     def run(self, hooke):
         """Run Hooke's main execution loop.
@@ -153,7 +163,7 @@ class HookeRunner (object):
         command_to_ui = multiprocessing.Queue()
         manager = multiprocessing.Manager()
         command = multiprocessing.Process(name='command engine',
-            target=hooke.command.run, args=(hooke, ui_to_command, command_to_ui))
+            target=hooke.engine.run, args=(hooke, ui_to_command, command_to_ui))
         command.start()
         return (ui_to_command, command_to_ui, command)