X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/a9ce8d6ae47ce34389bae9441bb83526ff582195..dcc5bde3beb88310fdc2815383ba1509e3997607:/erebus.py diff --git a/erebus.py b/erebus.py index 07fef14..524b9a4 100644 --- a/erebus.py +++ b/erebus.py @@ -3,12 +3,13 @@ # Erebus IRC bot - Author: John Runyon # main startup code -#TODO: tons - -import os, sys, select, MySQLdb, MySQLdb.cursors, time +import os, sys, select, MySQLdb, MySQLdb.cursors, time, random, gc import bot, config, ctlmod -class Erebus(object): +class Erebus(object): #singleton to pass around + APIVERSION = 2 + RELEASE = 0 + bots = {} fds = {} numhandlers = {} @@ -25,6 +26,13 @@ class Erebus(object): self.chans = [] + def msg(self, *args, **kwargs): + main.randbot().msg(self, *args, **kwargs) + def slowmsg(self, *args, **kwargs): + main.randbot().slowmsg(self, *args, **kwargs) + def fastmsg(self, *args, **kwargs): + main.randbot().fastmsg(self, *args, **kwargs) + def isauthed(self): return self.auth is not None @@ -37,8 +45,8 @@ class Erebus(object): if self.auth is None: self.glevel = -1 else: - c = main.db.cursor() - if c.execute("SELECT level FROM users WHERE auth = %s", (self.auth,)): + c = main.query("SELECT level FROM users WHERE auth = %s", (self.auth,)) + if c: row = c.fetchone() if row is not None: self.glevel = row['level'] @@ -49,12 +57,16 @@ class Erebus(object): return self.glevel def join(self, chan): - self.chans.append(chan) + if chan not in self.chans: self.chans.append(chan) def part(self, chan): - self.chans.remove(chan) - def quit(self): - for chan in self.chans: + try: self.chans.remove(chan) + except: pass + return len(self.chans) == 0 + def quit(self): + pass + def nickchange(self, newnick): + self.nick = newnick def __str__(self): return self.nick def __repr__(self): return "" % (self.nick,self.glevel) @@ -69,14 +81,21 @@ class Erebus(object): self.voices = [] self.ops = [] - c = main.db.cursor() - if c.execute("SELECT user, level FROM chusers WHERE chan = %s", (self.name,)): + c = main.query("SELECT user, level FROM chusers WHERE chan = %s", (self.name,)) + if c: row = c.fetchone() while row is not None: self.levels[row['user']] = row['level'] row = c.fetchone() + def msg(self, *args, **kwargs): + self.bot.msg(self, *args, **kwargs) + def slowmsg(self, *args, **kwargs): + self.bot.slowmsg(self, *args, **kwargs) + def fastmsg(self, *args, **kwargs): + self.bot.fastmsg(self, *args, **kwargs) + def levelof(self, auth): if auth is None: return 0 @@ -89,8 +108,8 @@ class Erebus(object): def setlevel(self, auth, level, savetodb=True): auth = auth.lower() if savetodb: - c = main.db.cursor() - if c.execute("REPLACE INTO chusers (chan, user, level) VALUES (%s, %s, %s)", (self.name, auth, level)): + c = main.query("REPLACE INTO chusers (chan, user, level) VALUES (%s, %s, %s)", (self.name, auth, level)) + if c: self.levels[auth] = level return True else: @@ -117,8 +136,9 @@ class Erebus(object): def __str__(self): return self.name def __repr__(self): return "" % (self.name) - def __init__(self, trigger): - self.trigger = trigger + def __init__(self, cfg): + self.cfg = cfg + self.trigger = cfg.trigger if os.name == "posix": self.potype = "poll" self.po = select.poll() @@ -126,9 +146,32 @@ class Erebus(object): self.potype = "select" self.fdlist = [] - def newbot(self, nick, user, bind, server, port, realname): + def query(self, *args, **kwargs): + if 'norecurse' in kwargs: + norecurse = kwargs['norecurse'] + del kwargs['norecurse'] + else: + norecurse = False + + self.log("[SQL]", "?", "query(%s, %s)" % (', '.join([repr(i) for i in args]), ', '.join([str(key)+"="+repr(kwargs[key]) for key in kwargs]))) + try: + curs = self.db.cursor() + res = curs.execute(*args, **kwargs) + if res: + return curs + else: + return res + except MySQLdb.MySQLError as e: + self.log("[SQL]", "!", "MySQL error! %r" % (e)) + if not norecurse: + dbsetup() + return self.query(*args, norecurse=True, **kwargs) + else: + raise e + + def newbot(self, nick, user, bind, authname, authpass, server, port, realname): if bind is None: bind = '' - obj = bot.Bot(self, nick, user, bind, server, port, realname) + obj = bot.Bot(self, nick, user, bind, authname, authpass, server, port, realname) self.bots[nick.lower()] = obj def newfd(self, obj, fileno): @@ -143,20 +186,22 @@ class Erebus(object): def fd(self, fileno): #get Bot() by fd/fileno return self.fds[fileno] def randbot(self): #get Bot() randomly - for b in self.bots.itervalues(): return b #TODO + return self.bots[random.choice(self.bots.keys())] - def user(self, _nick, justjoined=False): + def user(self, _nick, justjoined=False, create=True): nick = _nick.lower() if nick in self.users: return self.users[nick] - else: + elif create: user = self.User(_nick) self.users[nick] = user if justjoined: - self.randbot().conn.send("WHO %s n%%ant,2" % (nick)) + self.randbot().conn.send("WHO %s n%%ant,1" % (nick)) return user + else: + return None def channel(self, name): #get Channel() by name if name.lower() in self.chans: return self.chans[name.lower()] @@ -182,6 +227,12 @@ class Erebus(object): def module(self, name): return ctlmod.modules[name] + def log(self, source, level, message): + print "%09.3f %s [%s] %s" % (time.time() % 100000, source, level, message) + + def getuserbyauth(self, auth): + return [u for u in self.users.itervalues() if u.auth == auth.lower()] + #bind functions def hook(self, word, handler): try: @@ -223,40 +274,35 @@ class Erebus(object): return self.chanhandlers[chan] -class MyCursor(MySQLdb.cursors.DictCursor): - def execute(self, *args, **kwargs): - print "[SQL] [#] MyCursor.execute(self, %s, %s)" % (', '.join([repr(i) for i in args]), ', '.join([str(key)+"="+repr(kwargs[key]) for key in kwargs])) - try: - super(self.__class__, self).execute(*args, **kwargs) - except MySQLdb.MySQLError as e: - print "[SQL] [!] MySQL error! %r" % (e) - dbsetup() - return False - return True - - def dbsetup(): main.db = None - main.db = MySQLdb.connect(host=cfg.dbhost, user=cfg.dbuser, passwd=cfg.dbpass, db=cfg.dbname, cursorclass=MyCursor) + main.db = MySQLdb.connect(host=cfg.dbhost, user=cfg.dbuser, passwd=cfg.dbpass, db=cfg.dbname, cursorclass=MySQLdb.cursors.DictCursor) def setup(): global cfg, main - cfg = config.Config('bot.config') - main = Erebus(cfg.trigger) + cfg = config.setup('bot.config') + + if cfg.getboolean('debug', 'gc'): + gc.set_debug(gc.DEBUG_LEAK) + + pidfile = open(cfg.pidfile, 'w') + pidfile.write(str(os.getpid())) + pidfile.close() + + main = Erebus(cfg) autoloads = [mod for mod, yes in cfg.items('autoloads') if int(yes) == 1] for mod in autoloads: - print "Loading %s" % (mod) ctlmod.load(main, mod) dbsetup() - c = main.db.cursor() - if c.execute("SELECT nick, user, bind FROM bots WHERE active = 1"): + c = main.query("SELECT nick, user, bind, authname, authpass FROM bots WHERE active = 1") + if c: rows = c.fetchall() c.close() for row in rows: - main.newbot(row['nick'], row['user'], row['bind'], cfg.host, cfg.port, cfg.realname) + main.newbot(row['nick'], row['user'], row['bind'], row['authname'], row['authpass'], cfg.host, cfg.port, cfg.realname) main.connectall() def loop(): @@ -266,5 +312,9 @@ def loop(): main.fd(fileno).parse(line) if __name__ == '__main__': + try: os.rename('logfile', 'oldlogs/%s' % (time.time())) + except: pass + sys.stdout = open('logfile', 'w', 1) + sys.stderr = sys.stdout setup() while True: loop()