update modules to use default command name (based on function name)

[erebus.git] / modlib.py

diff --git a/modlib.py b/modlib.py
index 5fb7e77704866e97751848400d015cde5cb0a4d8..313f03348a81d63b54ad760eae00d30c975615dc 100644 (file)
--- a/modlib.py
+++ b/modlib.py
@@ -10,23 +10,24 @@ class error(object):
        def __repr__(self):
                return '<modlib.error %r>' % self.errormsg
        def __str__(self):
-               return self.errormsg
+               return str(self.errormsg)
 
 class modlib(object):
        # default (global) access levels
-       MANAGER = 100
-       ADMIN = 75
-       STAFF = 50
-       AUTHED = 0
-       ANYONE = -1
+       OWNER   = 100
+       MANAGER =  99
+       ADMIN   =  75
+       STAFF   =  50
+       AUTHED  =   0
+       ANYONE  =  -1
 
        # (channel) access levels
-       OWNER = 5
-       MASTER = 4
-       OP = 3
-       VOICE = 2
-       KNOWN = 1
-       PUBLIC = 0 #anyone (use glevel to control auth-needed)
+       OWNER   =   5
+       MASTER  =   4
+       OP      =   3
+       VOICE   =   2
+       KNOWN   =   1
+       PUBLIC  =   0 #anyone (use glevel to control auth-needed)
 
        # messages
        WRONGARGS = "Wrong number of arguments."
@@ -59,9 +60,9 @@ class modlib(object):
 
        def hooknum(self, num):
                def realhook(func):
-                       self.numhooks[num] = func
+                       self.numhooks[str(num)] = func
                        if self.parent is not None:
-                               self.parent.hooknum(num, func)
+                               self.parent.hooknum(str(num), func)
                        return func
                return realhook
 
@@ -73,8 +74,13 @@ class modlib(object):
                        return func
                return realhook
 
-       def hook(self, cmd, needchan=True, glevel=ANYONE, clevel=PUBLIC):
+       def hook(self, cmd=None, needchan=True, glevel=ANYONE, clevel=PUBLIC):
+               _cmd = cmd #save this since it gets wiped out...
                def realhook(func):
+                       cmd = _cmd #...and restore it
+                       if cmd is None:
+                               cmd = func.__name__ # default to function name
+
                        func.needchan = needchan
                        func.reqglevel = glevel
                        func.reqclevel = clevel
@@ -85,6 +91,12 @@ class modlib(object):
                        return func
                return realhook
 
+       def mod(self, modname):
+               if self.parent is not None:
+                       return self.parent.module(modname)
+               else:
+                       return error('unknown parent')
+
        def argsEQ(self, num):
                def realhook(func):
                        def checkargs(bot, user, chan, realtarget, *args):
@@ -92,6 +104,7 @@ class modlib(object):
                                        return func(bot, user, chan, realtarget, *args)
                                else:
                                        bot.msg(user, self.WRONGARGS)
+                       checkargs.__name__ = func.__name__
                        return checkargs
                return realhook
 
@@ -102,5 +115,6 @@ class modlib(object):
                                        return func(bot, user, chan, realtarget, *args)
                                else:
                                        bot.msg(user, self.WRONGARGS)
+                       checkargs.__name__ = func.__name__
                        return checkargs
                return realhook