Support multiple active UIs.

coderanger · coderanger · commit eb9bc66bc67b · 2011-03-14T14:33:52.000-04:00
diff --git a/pyzen/core.py b/pyzen/core.py
@@ -74,7 +74,7 @@ def reloader(q, func, args, kwargs):
 
 def main(ui_override, func, *args, **kwargs):
     p = None
-    ui = load_ui(ui_override)
+    uis = list(load_ui(ui_override))
     try:
         while True:
             q = Queue()
@@ -84,7 +84,7 @@ def main(ui_override, func, *args, **kwargs):
             while True:
                 try:
                     cmd = q.get(True, _SLEEP_TIME)
-                    if ui is not None:
+                    for ui in uis:
                         ui.handle(**cmd)
                 except Empty:
                     # Timed out, check if we need to restart
@@ -94,7 +94,7 @@ def main(ui_override, func, *args, **kwargs):
                         else:
                             return p.exitcode # Any other return code should be considered real
     finally:
-        if ui is not None:
+        for ui in uis:
             ui.shutdown()
         if p is not None:
             p.terminate()
diff --git a/pyzen/ui/base.py b/pyzen/ui/base.py
@@ -57,11 +57,13 @@ def shutdown(self):
 
 def load_ui(override):
     if override:
+        if isinstance(override, basestring):
+            override = set(override.split(','))
         for ui in PyZenUIMeta.uis:
-            if ui.name == override:
-                return ui()
+            if ui.name in override:
+                yield ui()
     else:
         for ui in PyZenUIMeta.uis:
             if ui.enabled():
-                return ui()
+                yield ui()
     
