Metadir.create(): handle tiered repositories

[mw] / src / mw / cli.py

diff --git a/src/mw/cli.py b/src/mw/cli.py
index 7f5b4bcd00cc15003212a3fc02408a0e3c0d223b..238f72ed9b518264f17e2ea28bfed8719577dc6e 100644 (file)
--- a/src/mw/cli.py
+++ b/src/mw/cli.py
@@ -13,19 +13,20 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along

-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.

 ###
 
 import inspect
 import mw.clicommands
 import os
 import sys
 ###
 
 import inspect
 import mw.clicommands
 import os
 import sys

+from pprint import pprint

 
 class CLI(object):
     def __init__(self):
         self.me = os.path.basename(sys.argv[0])
         self.commands = {}
 
 class CLI(object):
     def __init__(self):
         self.me = os.path.basename(sys.argv[0])
         self.commands = {}

+        self.shortcuts = {}

         for name in mw.clicommands.__dict__:
             if name == 'CommandBase':
                 continue
         for name in mw.clicommands.__dict__:
             if name == 'CommandBase':
                 continue


@@ -34,20 +35,30 @@ class CLI(object):
                issubclass(clazz, mw.clicommands.CommandBase):
                 cmd = clazz()
                 self.commands[cmd.name] = cmd
                issubclass(clazz, mw.clicommands.CommandBase):
                 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
         print
         for name in self.commands:
             cmd = self.commands[name]
 
     def usage(self):
         print 'usage: %s [subcommand]' % self.me
         print
         for name in self.commands:
             cmd = self.commands[name]

-            print("\t%-14s %-25s" % (name, cmd.description))
+            if len(cmd.shortcuts) > 0:
+                full = name + ' (' + ' '.join(cmd.shortcuts) + ')'
+            else:
+                full = name
+            print("\t%-14s %-25s" % (full, cmd.description))

         print
         sys.exit(1)
 
     def main(self):
         # determine what the subcommand is
         if len(sys.argv) > 1:
         print
         sys.exit(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()


@@ -57,4 +68,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()