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 = {}
self.chans = []
def msg(self, *args, **kwargs):
- main.randbot.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
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.name, *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:
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 "[SQL] [#] MyCursor.execute(self, %s, %s)" % (', '.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 "[SQL] [!] MySQL error! %r" % (e)
+ main.log("[SQL]", "!", "MySQL error! %r" % (e))
+# print "%09.3f [SQL] [!] MySQL error! %r" % (time.time() % 100000, e)
dbsetup()
return False
return True
global cfg, main
cfg = config.Config('bot.config')
+
+ 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),
- modstatus = ctlmod.load(main, mod)
- if not modstatus:
- print str(modstatus)
- elif modstatus == True:
- print "OK"
- else:
- print modstatus
+ ctlmod.load(main, mod)
dbsetup()
c = main.db.cursor()
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()