Moved plugin configuration to plugins.json

After listening to HPR 1284 today, I realized that it's important to
keep configuration of what Kaylee *does* separate from other
configuration.  Specifically, once TTS integration is done, voice
configuration will need to be separate from configuration of actions,
because it's common to have several computers with the same actions but
different voices.  Therefore, I've moved all configuration about plugins
into a new file called plugins.json.

kayleevc/kaylee.py

@@ -27,9 +27,14 @@ class Kaylee:
         self.config = Config()
         self.options = vars(self.config.options)
 
+        # Make sure some plugins are configured to be loaded
+        if self.config.plugins is None:
+            print("error: no plugins configured", file=sys.stderr)
+            sys.exit(1)
+
         # Load plugins
         self.plugins = []
-        for plugin in self.options['plugins'].keys():
+        for plugin in self.config.plugins.keys():
             pmod = importlib.import_module(plugin, 'kayleevc.plugins')
             self.plugins.append(pmod.Plugin(self.config, plugin))
 

kayleevc/plugins/pluginbase.py

@@ -29,7 +29,7 @@ class PluginBase(GObject.Object):
         super().__init__()
         self.config = config
         self.name = name
-        self.options = config.options.plugins[name]
+        self.options = config.plugins[name]
         self.corpus_strings = set()
 
     def recognizer_finished(self, recognizer, text):

kayleevc/util.py

@@ -27,6 +27,7 @@ class Config:
 
     # Configuration files
     opt_file = os.path.join(conf_dir, "options.json")
+    plugins_file = os.path.join(conf_dir, "plugins.json")
 
     # Cache files
     history_file = os.path.join(cache_dir, program_name + "history")
@@ -76,6 +77,9 @@ class Config:
         # Parse command-line arguments, overriding config file as appropriate
         self._parser.parse_args(namespace=self.options)
 
+        # Read the plugins file
+        self._read_plugins_file()
+
     def _make_dir(self, directory):
         if not os.path.exists(directory):
             os.makedirs(directory)
@@ -89,6 +93,13 @@ class Config:
             # Make an empty options namespace
             self.options = Namespace()
 
+    def _read_plugins_file(self):
+        try:
+            with open(self.plugins_file, 'r') as f:
+                self.plugins = json.load(f, object_pairs_hook=OrderedDict)
+        except FileNotFoundError:
+            self.plugins = None
+
 
 class Hasher:
     """Keep track of hashes for Kaylee"""

options.json.tmp

@@ -1,10 +1,4 @@
 {
-    "plugins": {
-        ".shell": {
-            "hello world": "echo \"hello world\"",
-            "start a %d minute timer": "(echo {0} minute timer started && sleep {0}m && echo {0} minute timer ended) &"
-        }
-    },
     "continuous": false,
     "history": null,
     "microphone": null,

plugins.json.tmp

@@ -0,0 +1,6 @@
+{
+    ".shell": {
+        "hello world": "echo \"hello world\"",
+        "start a %d minute timer": "(echo {0} minute timer started && sleep {0}m && echo {0} minute timer ended) &"
+    }
+}