better argument treatment

frappyman.py

@@ -56,7 +56,12 @@ class FrappyManager(ServiceManager):
                 cfgpaths.append(cfgpath)
         return cfgpaths
 
-    def prepare_start(self, ins, service):
+    def prepare_start(self, ins, service, cfg=''):
+        import os
+        import sys
+        print('CWD', os.getcwd())
+        print('PYTHONPATH', sys.path)
+
         start_dir, env = super().prepare_start(ins, service)
         his = env.get('FRAPPY_HISTORY')
         if his:
@@ -67,6 +72,11 @@ class FrappyManager(ServiceManager):
             print(env['SECOP_CONFDIR'])
         return start_dir, env
 
+    def do_start(self, ins, service=None, cfg='', restart=False, wait=False, logger=None):
+        if cfg and not service and len(self.services) != 1:
+            raise UsageError('need service to start (one of %s)' % ', '.join(self.services))
+        super().do_start(ins, service, cfg, restart, wait, logger)
+
     def do_gui(self, ins='', service='main'):
         start_dir, env = self.prepare_start(ins, service)
         sys.path.insert(0, start_dir)
@@ -95,23 +105,42 @@ class FrappyManager(ServiceManager):
 
         return app.exec_()
 
+    def all_cfg(self, ins, service, by_dir=False):
+        result = {}
+        all_cfg = {}
+        for ins in [ins] if ins else self.info:
+            for service in [service] if service else self.services:
+                for cfgdir in self.config_dirs(ins, service):
+                    result.setdefault(cfgdir, {})
+                    cfgs = result[cfgdir]
+                    for cfgfile in glob(join(cfgdir, '*.cfg')):
+                        desc = ''
+                        try:
+                            parser = ConfigParser()
+                            parser.read(cfgfile)
+                            for s in parser.sections():
+                                if s == 'NODE' or s.startswith('node '):
+                                    desc = parser[s].get('description', '').split('\n')[0]
+                                    break
+                        except Exception:
+                            pass
+                        cfg = basename(cfgfile)[:-4]
+                        if cfg not in all_cfg:
+                            all_cfg[cfg] = desc
+                            cfgs[cfg] = desc
+        return result if by_dir else all_cfg
+
     def do_listcfg(self, ins='', service='main'):
-        for cfgdir in self.config_dirs(ins, service):
-            table = []
-            for cfgfile in glob(join(cfgdir, '*.cfg')):
-                desc = ''
-                try:
-                    parser = ConfigParser()
-                    parser.read(cfgfile)
-                    for s in parser.sections():
-                        if s == 'NODE' or s.startswith('node '):
-                            desc = parser[s].get('description', '').split('\n')[0]
-                            break
-                except Exception:
-                    pass
-                table.append((basename(cfgfile)[:-4], desc))
-            if table:
+        for cfgdir, cfgs in self.all_cfg(ins, service, by_dir=True).items():
+            if cfgs:
                 print('\n--- %s:\n' % cfgdir)
-                lcol = max(len(c) for c, _ in table)
-                for cfg, desc in table:
-                    print('%s %s' % (cfg.ljust(lcol), desc))
+                keylen = max(len(k) for k in cfgs)
+                for cfg, desc in cfgs.items():
+                    print('%s %s' % (cfg.ljust(keylen), desc))
+
+    def treat_args(self, argdict, unknown=(), extra=()):
+        if len(unknown) == 1:
+            cfg = unknown[0]
+            if ',' in cfg or cfg in self.all_cfg(argdict.get('ins'), argdict.get('service')):
+                return super().treat_args(argdict, (), unknown)
+        return super().treat_args(argdict, unknown, extra)