Replace .config rather than reconstructing plugins, drivers, and UIs.

[hooke.git] / hooke / hooke.py

diff --git a/hooke/hooke.py b/hooke/hooke.py
index b16a800c738005b2e3ecc50079430f914daad8da..b9a659e77397d191ed913939b0bcb816d86378c3 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
@@ -104,22 +105,49 @@ class Hooke (object):
     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())
+        self.command_by_name = dict(
+            [(c.name, c) for c in self.commands])
 
     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 close(self):
-        self.config.write() # Does not preserve original comments
+    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, 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
@@ -165,12 +193,13 @@ 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):
         log = logging.getLogger('hooke')
         log.debug('cleanup sending CloseEngine')
-        ui_to_command.put(ui.CloseEngine())
+        ui_to_command.put(engine.CloseEngine())
         hooke = None
         while not isinstance(hooke, Hooke):
             log.debug('cleanup waiting for Hooke instance from the engine.')
@@ -193,9 +222,12 @@ 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(
+        '--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.")
@@ -223,11 +255,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)