import os, sys, select, MySQLdb, MySQLdb.cursors, time, random
import bot, config, ctlmod
-class Erebus(object):
+class Erebus(object): #singleton to pass around
APIVERSION = 1
RELEASE = 0
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)
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 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 randbot(self): #get Bot() randomly
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()]
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)
+
#bind functions
def hook(self, word, handler):
try:
class MyCursor(MySQLdb.cursors.DictCursor):
def execute(self, *args, **kwargs):
- print "%05.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]))
+ 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 "%05.3f [SQL] [!] MySQL error! %r" % (time.time() % 100000, e)
+ main.log("[SQL]", "!", "MySQL error! %r" % (e))
+# print "%09.3f [SQL] [!] MySQL error! %r" % (time.time() % 100000, e)
dbsetup()
return False
return True
if __name__ == '__main__':
try: os.rename('logfile', 'oldlogs/%s' % (time.time()))
except: pass
- sys.stdout = open('logfile', 'w')
+ sys.stdout = open('logfile', 'w', 1)
sys.stderr = sys.stdout
setup()
while True: loop()