projects
/
mw
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make 'mw help' work properly
[mw]
/
src
/
mw
/
cli.py
diff --git
a/src/mw/cli.py
b/src/mw/cli.py
index 7dc49c5600286fdc11688507a9d9b97875f39656..ef33d7357b41a267edb7237f28038a892fc0932a 100644
(file)
--- a/
src/mw/cli.py
+++ b/
src/mw/cli.py
@@
-1,6
+1,6
@@
###
# mw - VCS-like nonsense for MediaWiki websites
###
# mw - VCS-like nonsense for MediaWiki websites
-# Copyright (C) 20
09
Ian Weller <ian@ianweller.org>
+# Copyright (C) 20
10
Ian Weller <ian@ianweller.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-13,16
+13,16
@@
# 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 mw.clicommands
import os
import sys
+
class CLI(object):
class CLI(object):
+
def __init__(self):
self.me = os.path.basename(sys.argv[0])
self.commands = {}
def __init__(self):
self.me = os.path.basename(sys.argv[0])
self.commands = {}
@@
-36,6
+36,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,9
+58,9
@@
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
the_command = sys.argv[1] # SWEET ACTION
- elif sys.argv[1] in ['--help', '-h']:
+ elif sys.argv[1] in ['--help', '-h'
, 'help'
]:
self.usage()
else:
print '%s: invalid subcommand: %s' % (self.me, sys.argv[1])
self.usage()
else:
print '%s: invalid subcommand: %s' % (self.me, sys.argv[1])
@@
-63,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()
Benjamin Mako Hill
||
Want to submit a patch?