Make subcommands finally work properly

[mw] / src / mw / cli.py

diff --git a/src/mw/cli.py b/src/mw/cli.py
index 7dc49c5600286fdc11688507a9d9b97875f39656..d5dd6dc875d7699262868674e04019990b2bf9c2 100644 (file)
--- a/src/mw/cli.py
+++ b/src/mw/cli.py
@@ -21,6 +21,7 @@ import inspect
 import mw.clicommands
 import os
 import sys
 import mw.clicommands
 import os
 import sys

+from pprint import pprint

 
 class CLI(object):
     def __init__(self):
 
 class CLI(object):
     def __init__(self):


@@ -36,6 +37,11 @@ class CLI(object):
                 cmd = clazz()
                 self.commands[cmd.name] = cmd
                 self.shortcuts[cmd.name] = cmd.shortcuts
                 cmd = clazz()
                 self.commands[cmd.name] = cmd
                 self.shortcuts[cmd.name] = cmd.shortcuts

+        self.all_commands = {}
+        self.all_commands.update(self.commands)
+        for command in self.shortcuts:
+            for shortcut in self.shortcuts[command]:
+                self.all_commands[shortcut] = self.commands[command]

 
     def usage(self):
         print 'usage: %s [subcommand]' % self.me
 
     def usage(self):
         print 'usage: %s [subcommand]' % self.me


@@ -53,7 +59,7 @@ class CLI(object):
     def main(self):
         # determine what the subcommand is
         if len(sys.argv) > 1:
     def main(self):
         # determine what the subcommand is
         if len(sys.argv) > 1:

-            if sys.argv[1] in self.commands.keys():
+            if sys.argv[1] in self.all_commands:

                 the_command = sys.argv[1] # SWEET ACTION
             elif sys.argv[1] in ['--help', '-h']:
                 self.usage()
                 the_command = sys.argv[1] # SWEET ACTION
             elif sys.argv[1] in ['--help', '-h']:
                 self.usage()


@@ -63,4 +69,4 @@ class CLI(object):
         if len(sys.argv) == 1:
             self.usage()
         # woo let's go
         if len(sys.argv) == 1:
             self.usage()
         # woo let's go

-        self.commands[the_command].main()
+        self.all_commands[the_command].main()