Map sub commands to class functions

This allows the use of hypens in subcommands because 
they are no longer directly mapped to the class function they initiate.
Do some more fine tuning of the grouping identifiers.

2 files changed, 8 insertions, 1 deletions

diff --git a/gkeys-ldap/gkeyldap/actions.py b/gkeys-ldap/gkeyldap/actions.py
index 1d8e848..b543685 100644
--- a/gkeys-ldap/gkeyldap/actions.py
+++ b/gkeys-ldap/gkeyldap/actions.py
@@ -25,6 +25,11 @@ Action_Options = {
     'updateseeds': ['fingerprint', 'mail', 'name', 'nick', 'category', 'status'],
 }
 
+Action_Map = {
+    'ldap-search': 'ldapsearch',
+    'update-seeds': 'updateseeds',
+}
+
 
 def get_key_ids(key_len, keyids):
     '''Small utility function to return only keyid (short)
diff --git a/gkeys-ldap/gkeyldap/cli.py b/gkeys-ldap/gkeyldap/cli.py
index bb4f5c3..c85176f 100644
--- a/gkeys-ldap/gkeyldap/cli.py
+++ b/gkeys-ldap/gkeyldap/cli.py
@@ -12,7 +12,8 @@ from gkeys import seed
 from gkeys.base import CliBase
 from gkeys.config import GKeysConfig
 from gkeyldap import connect, search
-from gkeyldap.actions import Actions, Available_Actions, Action_Options
+from gkeyldap.actions import (Actions, Available_Actions, Action_Options,
+    Action_Map)
 
 
 class Main(CliBase):
@@ -35,6 +36,7 @@ class Main(CliBase):
             'Actions': Actions,
             'Available_Actions': Available_Actions,
             'Action_Options': Action_Options,
+            'Action_Map': Action_Map,
             'prog': 'gkey-ldap',
             'description': 'Gentoo-keys LDAP interface and seed file generator program',
             'epilog': '''CAUTION: adding UNTRUSTED keys can be HAZARDOUS to your system!'''