diff options
| -rwxr-xr-x | IRC/asybot.py | 4 | ||||
| -rw-r--r-- | IRC/getconf.py | 4 | ||||
| -rw-r--r-- | TODO | 1 | ||||
| -rwxr-xr-x | commands/caps | 2 | ||||
| -rw-r--r-- | config.py | 4 |
5 files changed, 7 insertions, 8 deletions
diff --git a/IRC/asybot.py b/IRC/asybot.py index 38f0df1..0ac7a27 100755 --- a/IRC/asybot.py +++ b/IRC/asybot.py @@ -20,7 +20,7 @@ from re import split, search, match from textwrap import TextWrapper import logging,logging.handlers -config_filename = 'config.py' +config_filename = './config.py' from getconf import make_getconf getconf = make_getconf(config_filename) @@ -129,7 +129,7 @@ class asybot(asychat): def ME(text): PRIVMSG(('ACTION ' + text + '').encode(encoding='UTF-8')) - for command in getconf('irc_commands'): + for command in getconf('commands'): y = match(command['pattern'], rest) if y: self.execute_command(command, y, prefix, PRIVMSG, ME) diff --git a/IRC/getconf.py b/IRC/getconf.py index d6e9f42..f9cd440 100644 --- a/IRC/getconf.py +++ b/IRC/getconf.py @@ -8,12 +8,12 @@ import os def make_getconf(filename): - config = load_config(filename) def getconf(prop): prop_split = prop.split('.') string = '' - imp.reload(config) + config = load_config(filename) + #imp.reload(config) tmp = config.__dict__ for pr in prop_split: tmp = tmp[pr] @@ -1,5 +1,4 @@ commands/caps: merge load_config with IRC/getconf.py -commands/caps: generalize for UDP getconf: reload inotify diff --git a/commands/caps b/commands/caps index a9ce451..c47319f 100755 --- a/commands/caps +++ b/commands/caps @@ -9,4 +9,4 @@ def load_config(filename): return imp.load_module(modname, file, pathname, description) config = load_config(os.environ['config_filename']) -print(' '.join(filter(None,[ x.get('capname',None) for x in config.irc_commands]))) +print(' '.join(filter(None,[ x.get('capname',None) for x in config.commands]))) @@ -2,7 +2,7 @@ debug = True # CAVEAT name should not contains regex magic -name = 'kwasybot' +name = 'crabmanner' irc_alarm_timeout = 300 irc_hammer_interval = 10 @@ -20,7 +20,7 @@ def default_command(cmd): 'pattern': '^(?:' + name + '|\\*):\\s*' + cmd + '\\s*$', 'argv': [ 'commands/' + cmd ] } -irc_commands = [ +commands = [ default_command('caps'), default_command('hello'), default_command('reload'), |