import os, sys, select, MySQLdb, MySQLdb.cursors, time, random
import bot, config, ctlmod
-class Erebus(object):
- APIVERSION = 1
+class Erebus(object): #singleton to pass around
+ APIVERSION = 2
RELEASE = 0
bots = {}
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):
try:
self.chans.remove(chan)
except: pass
+ return len(self.chans) == 0
def quit(self):
- for chan in self.chans:
- self.chans.remove(chan)
+ pass
def nickchange(self, newnick):
self.nick = newnick
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:
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:
class MyCursor(MySQLdb.cursors.DictCursor):
def execute(self, *args, **kwargs):
- print "%09.3f [SQL] [#] MyCursor.execute(self, %s, %s)" % (time.time() % 100000, ', '.join([repr(i) for i in args]), ', '.join([str(key)+"="+repr(kwargs[key]) for key in kwargs]))
+ if 'norecurse' in kwargs: norecurse = kwargs['norecurse']
+ else: norecurse = False
+ main.log("[SQL]", "?", "MyCursor.execute(self, %s, %s)" % (', '.join([repr(i) for i in args]), ', '.join([str(key)+"="+repr(kwargs[key]) for key in kwargs])))
+# print "%09.3f [SQL] [#] MyCursor.execute(self, %s, %s)" % (time.time() % 100000, ', '.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)
+ return super(self.__class__, self).execute(*args, **kwargs)
except MySQLdb.MySQLError as e:
- print "%09.3f [SQL] [!] MySQL error! %r" % (time.time() % 100000, e)
- dbsetup()
+ main.log("[SQL]", "!", "MySQL error! %r" % (e))
+# print "%09.3f [SQL] [!] MySQL error! %r" % (time.time() % 100000, e)
+ if not norecurse:
+ dbsetup()
+ return self.execute(norecurse=True, *args, **kwargs)
return False
return True