Added --config option to bin/hk.py to override built in config file path.

[hooke.git] / hooke / hooke.py

diff --git a/hooke/hooke.py b/hooke/hooke.py
index cf6600ed8714fc8e6b4916a317935d79bb3e5a61..1942ac9d32c1e9fa2c065d934a7a0b267eea8c0e 100644 (file)
--- a/hooke/hooke.py
+++ b/hooke/hooke.py
@@ -54,6 +54,7 @@ if False: # Queue pickle error debugging code
         feed(buffer, notempty, s, writelock, close)
     multiprocessing.queues.Queue._feed = staticmethod(new_feed)
 
+from ConfigParser import NoSectionError
 import logging
 import logging.config
 import multiprocessing
@@ -91,7 +92,7 @@ class Hooke (object):
         self.load_drivers()
         self.load_ui()
         self.engine = engine.CommandEngine()
-        self.playlists = playlist.NoteIndexList()
+        self.playlists = playlist.Playlists()
 
     def load_log(self):
         config_file = StringIO.StringIO()
@@ -100,10 +101,13 @@ class Hooke (object):
         # Don't attach the logger because it contains an unpicklable
         # thread.lock.  Instead, grab it directly every time you need it.
         #self.log = logging.getLogger('hooke')
+        log = logging.getLogger('hooke')
+        log.debug('config paths: %s' % self.config._config_paths)
 
     def load_plugins(self):
         self.plugins = plugin_mod.load_graph(
             plugin_mod.PLUGIN_GRAPH, self.config, include_section='plugins')
+        self.configure_plugins()
         self.commands = []
         for plugin in self.plugins:
             self.commands.extend(plugin.commands())
@@ -113,15 +117,39 @@ class Hooke (object):
     def load_drivers(self):
         self.drivers = plugin_mod.load_graph(
             driver_mod.DRIVER_GRAPH, self.config, include_section='drivers')
+        self.configure_drivers()
 
     def load_ui(self):
         self.ui = ui.load_ui(self.config)
+        self.configure_ui()
+
+    def configure_plugins(self):
+        for plugin in self.plugins:
+            self._configure_item(plugin)
+
+    def configure_drivers(self):
+        for driver in self.drivers:
+            self._configure_item(driver)
+
+    def configure_ui(self):
+        self._configure_item(self.ui)
+
+    def _configure_item(self, item):
+        conditions = self.config.items('conditions')
+        try:
+            item.config = dict(self.config.items(item.setting_section))
+        except NoSectionError:
+            item.config = {}
+        for key,value in conditions:
+            if key not in item.config:
+                item.config[key] = value
 
-    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 `command` with `arguments` using
+        """Run the command named `command` with `arguments` using
         :meth:`~hooke.engine.CommandEngine.run_command`.
 
         Allows for running commands without spawning another process
@@ -167,6 +195,7 @@ class HookeRunner (object):
         command = multiprocessing.Process(name='command engine',
             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):
@@ -179,6 +208,9 @@ class HookeRunner (object):
             hooke = command_to_ui.get(block=True)
             log.debug('cleanup got %s instance' % type(hooke))
         command.join()
+        for playlist in hooke.playlists:  # Curve._hooke is not pickled.
+            for curve in playlist:
+                curve.set_hooke(hooke)
         return hooke
 
 
@@ -195,9 +227,18 @@ def main():
         action='append', default=[],
         help='Add a command line Hooke command to run.')
     p.add_option(
-        '--command-no-exit', dest='command_exit',
-        action='store_false', default=True,
+        '-p', '--persist', dest='persist', action='store_true', default=False,
         help="Don't exit after running a script or commands.")
+    p.add_option(
+        '-u', '--ui', dest='user_interface',
+        help="Override the configured user interface (for easy switching).")
+    p.add_option(
+        '--config', dest='config', metavar='FILE',
+        help="Override the default config file chain.")
+    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.")
@@ -207,6 +248,9 @@ def main():
             % (sys.argv[0], arguments)
         p.print_help(sys.stderr)
         sys.exit(1)
+    if options.config != None:
+        config_mod.DEFAULT_PATHS = [
+            os.path.abspath(os.path.expanduser(options.config))]
 
     hooke = Hooke(debug=__debug__)
     runner = HookeRunner()
@@ -218,6 +262,12 @@ def main():
         hooke.config.set(
             section='handler_hand1', option='level', value='NOTSET')
         hooke.load_log()
+    if options.user_interface not in [None, hooke.ui.name]:
+        hooke.config.set(
+            ui.USER_INTERFACE_SETTING_SECTION, hooke.ui.name, False)
+        hooke.config.set(
+            ui.USER_INTERFACE_SETTING_SECTION, options.user_interface, True)
+        hooke.load_ui()
     if options.script != None:
         with open(os.path.expanduser(options.script), 'r') as f:
             options.commands.extend(f.readlines())
@@ -225,11 +275,11 @@ def main():
         try:
             hooke = runner.run_lines(hooke, options.commands)
         finally:
-            if options.command_exit == True:
-                hooke.close()
+            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)