reworked module and sql debug messages

[erebus.git] / modlib.py

diff --git a/modlib.py b/modlib.py
index d2fe492b4c2af97fa0581e9586db3e9d05689b98..43187f9f09ed9770a05fa16e2d7fb84e05d5140a 100644 (file)
--- a/modlib.py
+++ b/modlib.py
@@ -60,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
 
@@ -74,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
@@ -86,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):
@@ -93,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
 
@@ -103,5 +115,22 @@ class modlib(object):
                                        return func(bot, user, chan, realtarget, *args)
                                else:
                                        bot.msg(user, self.WRONGARGS)
+                       checkargs.__name__ = func.__name__
                        return checkargs
                return realhook
+
+       def help(*args, **kwargs):
+               """help(args, shorthelp, longhelp, more lines longhelp, cmd=...?)
+               Example:
+               help("<user> <pass>", "login")
+                       ^ Help will only be one line. Command name determined based on function name.
+               help("<user> <level>", "add a user", cmd=("adduser", "useradd"))
+                       ^ Help will be listed under ADDUSER; USERADD will say "alias for adduser"
+               help(None, "do stuff", "This command is really complicated.")
+                       ^ Command takes no args. Short description (in overall HELP listing) is "do stuff".
+                       Long description (HELP <command>) will say "<command> - do stuff", newline, "This command is really complicated."
+               """
+               try:
+                       self.mod('help').reghelp(*args, **kwargs)
+               except:
+                       pass