X-Git-Url: http://git.tremily.us/?p=hooke.git;a=blobdiff_plain;f=hooke%2Fhooke.py;h=c475d3acb756d42bdff14328f84990f20659fa02;hp=1923d229c6151bdc241c51f6e4df99dcd047e43d;hb=7f628b00df5065d72e89cc86be596756eb9f1ac0;hpb=565f9d7b69d2e4a9ea447d7a50f8f835c3e08642

diff --git a/hooke/hooke.py b/hooke/hooke.py
index 1923d22..c475d3a 100644
--- a/hooke/hooke.py
+++ b/hooke/hooke.py
@@ -59,16 +59,19 @@ import logging.config
 import multiprocessing
 import optparse
 import os.path
+import Queue
 import unittest
 import StringIO
 import sys
 
-from . import engine as engine
+from . import version
+from . import engine
 from . import config as config_mod
-from . import playlist as playlist
+from . import playlist
 from . import plugin as plugin_mod
 from . import driver as driver_mod
-from . import ui as ui
+from . import ui
+from .compat import forking as forking  # dynamically patch multiprocessing.forking
 
 
 class Hooke (object):
@@ -88,7 +91,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):
@@ -105,6 +108,8 @@ class Hooke (object):
         self.commands = []
         for plugin in self.plugins:
             self.commands.extend(plugin.commands())
+        self.command_by_name = dict(
+            [(c.name, c) for c in self.commands])
 
     def load_drivers(self):
         self.drivers = plugin_mod.load_graph(
@@ -113,8 +118,19 @@ class Hooke (object):
     def load_ui(self):
         self.ui = ui.load_ui(self.config)
 
-    def close(self):
-        self.config.write() # Does not preserve original comments
+    def close(self, save_config=False):
+        if save_config == True:
+            self.config.write()  # Does not preserve original comments
+
+    def run_command(self, command, arguments):
+        """Run the command named `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):
@@ -151,20 +167,29 @@ 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()
+        hooke.engine = None  # no more need for the UI-side version.
         return (ui_to_command, command_to_ui, command)
 
     def _cleanup_run(self, ui_to_command, command_to_ui, command):
-        ui_to_command.put(ui.CloseEngine())
-        hooke = command_to_ui.get()
-        assert isinstance(hooke, Hooke)
+        log = logging.getLogger('hooke')
+        log.debug('cleanup sending CloseEngine')
+        ui_to_command.put(engine.CloseEngine())
+        hooke = None
+        while not isinstance(hooke, Hooke):
+            log.debug('cleanup waiting for Hooke instance from the engine.')
+            hooke = command_to_ui.get(block=True)
+            log.debug('cleanup got %s instance' % type(hooke))
         command.join()
         return hooke
 
 
 def main():
     p = optparse.OptionParser()
+    p.add_option(
+        '--version', dest='version', default=False, action='store_true',
+        help="Print Hooke's version information and exit.")
     p.add_option(
         '-s', '--script', dest='script', metavar='FILE',
         help='Script of command line Hooke commands to run.')
@@ -172,6 +197,16 @@ def main():
         '-c', '--command', dest='commands', metavar='COMMAND',
         action='append', default=[],
         help='Add a command line Hooke command to run.')
+    p.add_option(
+        '-p', '--persist', dest='persist', action='store_true', default=False,
+        help="Don't exit after running a script or commands.")
+    p.add_option(
+        '--save-config', dest='save_config',
+        action='store_true', default=False,
+        help="Automatically save a changed configuration on exit.")
+    p.add_option(
+        '--debug', dest='debug', action='store_true', default=False,
+        help="Enable debug logging.")
     options,arguments = p.parse_args()
     if len(arguments) > 0:
         print >> sys.stderr, 'More than 0 arguments to %s: %s' \
@@ -182,18 +217,25 @@ def main():
     hooke = Hooke(debug=__debug__)
     runner = HookeRunner()
 
+    if options.version == True:
+        print version()
+        sys.exit(0)
+    if options.debug == True:
+        hooke.config.set(
+            section='handler_hand1', option='level', value='NOTSET')
+        hooke.load_log()
     if options.script != None:
-        f = open(os.path.expanduser(options.script), 'r')
-        options.commands.extend(f.readlines())
-        f.close
+        with open(os.path.expanduser(options.script), 'r') as f:
+            options.commands.extend(f.readlines())
     if len(options.commands) > 0:
         try:
             hooke = runner.run_lines(hooke, options.commands)
         finally:
-            hooke.close()
-        sys.exit(0)
+            if options.persist == False:
+                hooke.close(save_config=options.save_config)
+                sys.exit(0)
 
     try:
         hooke = runner.run(hooke)
     finally:
-        hooke.close()
+        hooke.close(save_config=options.save_config)