X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/f5aec86546a7762dd0202f3983de22fe1c3814e9..8cf693989d9794d5310b66d179651dbc584a4e19:/modules/help.py diff --git a/modules/help.py b/modules/help.py index 27c80b7..9c66731 100644 --- a/modules/help.py +++ b/modules/help.py @@ -1,4 +1,5 @@ # Erebus IRC bot - Author: Erebus Team +# vim: fileencoding=utf-8 # help module # This file is released into the public domain; see http://unlicense.org/ @@ -6,7 +7,7 @@ modinfo = { 'author': 'Erebus Team', 'license': 'public domain', - 'compatible': [2], + 'compatible': [0], 'depends': [], 'softdeps': [], } @@ -14,7 +15,12 @@ modinfo = { # preamble import modlib lib = modlib.modlib(__name__) -modstart = lib.modstart +def modstart(parent, *args, **kwargs): + if parent.cfg.getboolean('erebus', 'nofakelag'): + lib.hook('help', needchan=False)(lib.help('[@|]', 'lists commands or describes a command', 'with @, lists all commands in ')(help_nolag)) + else: + lib.hook('help', needchan=False)(lib.help("", "describes a command", "see also: showcommands")(help)) + return lib.modstart(parent, *args, **kwargs) modstop = lib.modstop # module code @@ -76,9 +82,9 @@ class HelpLine(object): def __str__(self): if self.admin: - ret = "%-35s(%3s) - %-10s - " % (self.cmd+' '+self.syntax, self.glevel, self.module) + ret = "%-25s(%3s) - %-10s - " % (self.cmd+' '+self.syntax, self.glevel, self.module) else: - ret = "%-40s - " % (self.cmd+' '+self.syntax) + ret = "%-30s - " % (self.cmd+' '+self.syntax) if self.clevel != 0: ret += "(%s) " % (lib.clevs[self.clevel]) ret += str(self.shorthelp) @@ -94,28 +100,34 @@ def _mkhelp(level, func): return lines def _genhelp(bot, user, chan, realtarget, *args): - module = None + module = '' minlevel = -1 maxlevel = 100 - filepath = bot.parent.cfg.get('help', 'path', default='./help/%d.txt') + filepath = bot.parent.cfg.get('help', 'path', default='./help/%(@)s%(#)d.txt') for arg in args: if arg.startswith("@"): + if "." in arg[1:]: + raise Exception('Module option must not contain "."') module = arg[1:] elif arg.startswith("#") and user.glevel >= lib.ADMIN: minlevel = maxlevel = int(arg[1:]) + elif arg.startswith("+"): + maxlevel = int(arg[1:]) + elif arg.startswith("-"): + minlevel = int(arg[1:]) + elif arg.startswith("./"): + if "./" in arg[1:]: + raise Exception('Filename option must not contain "./" except as the first two characters') + else: + filepath = os.path.join('help', arg[2:]) else: - filepath = arg - if minlevel != maxlevel: - minlevel = maxlevel + raise Exception('Unknown option given to GENHELP: %s' % (arg)) for level in range(minlevel, maxlevel+1): - if '%d' in filepath: - filename = filepath % (level) - else: - filename = filepath + filename = filepath % {'#': level, '+': maxlevel, '-': minlevel, '@': module} fo = open(filename, 'w') lines = [] - for func in helps.itervalues(): - if module is not None and func.module != module: + for func in helps.values(): + if module != '' and func.module != module: continue lines += _mkhelp(level, func) for line in sorted(lines): @@ -124,7 +136,7 @@ def _genhelp(bot, user, chan, realtarget, *args): return True @lib.hook(glevel=1, needchan=False) -@lib.help("[@] [#] [file]", "generates help file", "arguments are all optional and may be specified in any order", "default file: ./help/.txt", "config as: [help]", "path = ./help/%d.txt") +@lib.help("[@] [#] [+] [-] [./]", "generates help file", "arguments are all optional and may be specified in any order", "default file: ./.txt, with module blank if not supplied. will always be under help/", "filename can also contain %(@)s, %(#)s, %(+)s, %(-)s", "for module, current (single) level, max and min level, respectively") def genhelp(bot, user, chan, realtarget, *args): try: _genhelp(bot, user, chan, realtarget, *args) @@ -133,10 +145,14 @@ def genhelp(bot, user, chan, realtarget, *args): return bot.msg(user, "Help written.") -@lib.hook(needchan=False) -@lib.help("", "describes a command") -@lib.argsGE(1) +# This is hooked in modstart +#@lib.hook(needchan=False) +#@lib.help("", "describes a command") def help(bot, user, chan, realtarget, *args): + if len(args) == 0: + bot.msg(user, "Usage: %sHELP " % bot.parent.trigger) + return showcommands(bot, user, chan, realtarget, *args) + cmd = str(' '.join(args)).lower() if cmd in cmds and user.glevel >= cmds[cmd].reqglevel: func = cmds[cmd] @@ -151,31 +167,25 @@ def help(bot, user, chan, realtarget, *args): @lib.hook(needchan=False) @lib.help(None, "provides command list") def showcommands(bot, user, chan, realtarget, *args): - if bool(int(bot.parent.cfg.get('help', 'autogen', default=0))): + if bot.parent.cfg.getboolean('help', 'autogen'): try: _genhelp(bot, user, chan, realtarget, *args) except: pass url = bot.parent.cfg.get('help', 'url', default=None) - if url is None: - try: - import urllib2 - myip = urllib2.urlopen("https://api.ipify.org").read() - url = "http://%s/help/%%d.txt (maybe)" % (myip) - except: url = None if url is not None: url = url % (user.glevel) - bot.msg(user, "Help is at: %s" % (url)) + bot.msg(user, "Command list is at: %s" % (url)) else: - bot.msg(user, "I don't know where help is. Sorry. Contact my owner.") + bot.msg(user, "I don't know where help is. Sorry. Contact my owner and tell him to set in the config file [help] url = .") -"""#DISABLED -@lib.hook(needchan=False) -@lib.help('[@|]', 'lists commands or describes a command', 'with @, lists all commands in ') -def help(bot, user, chan, realtarget, *args): +# This is hooked in modstart +#@lib.hook(needchan=False) +#@lib.help('[@|]', 'lists commands or describes a command', 'with @, lists all commands in ') +def help_nolag(bot, user, chan, realtarget, *args): if len(args) == 0: # list commands lines = [] - for func in helps.itervalues(): + for func in helps.values(): lines += _mkhelp(user, func) for line in sorted(lines): bot.slowmsg(user, str(line)) @@ -183,7 +193,7 @@ def help(bot, user, chan, realtarget, *args): elif args[0].startswith("@"): lines = [] mod = args[0][1:].lower() - for func in helps.itervalues(): + for func in helps.values(): if func.module == mod: lines += _mkhelp(user, func) for line in sorted(lines): @@ -193,7 +203,7 @@ def help(bot, user, chan, realtarget, *args): cmd = str(' '.join(args)).lower() if cmd in cmds and user.glevel >= cmds[cmd].reqglevel: func = cmds[cmd] - bot.slowmsg(user, str(HelpLine(func.cmd[0], func.syntax, func.shorthelp, (user.glevel > 0), func.reqglevel, func.module))) + bot.slowmsg(user, str(HelpLine(func.cmd[0], func.syntax, func.shorthelp, (user.glevel > 0), func.reqglevel, func.module, func.reqclevel))) for line in func.longhelps: bot.slowmsg(user, " %s" % (line)) bot.slowmsg(user, "End of help for %s." % (func.cmd[0])) @@ -202,5 +212,3 @@ def help(bot, user, chan, realtarget, *args): bot.slowmsg(user, " Aliases: %s" % (' '.join(func.cmd[1:]))) else: bot.slowmsg(user, "No help found for %s" % (cmd)) -""" -pass