- Fixed

diff --git a/bot.py b/bot.py
index a58b4ea6a006cc448ec6c509fd0c18e7c2cea5bd..a3b16f9938c19e4fcf0951b7af94d97dbaeab246 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -19,26 +19,33 @@ class Bot(object):
        def getdata(self):
                for line in self.conn.read():
                        print self.nick, '[I]', line
+
                        if not self.conn.registered():
                                pieces = line.split()
+
                                if pieces[0] == "PING":
                                        self.conn.send("PONG %s" % (pieces[1]))
+
                                elif pieces[1] == "001":
                                        self.conn.registered(True)
+
                                        for c in self.chans:
                                                self.join(c)
                        else:
                                self.parse(line)
        def parse(self, line):
                pieces = line.split()
+
                if pieces[1] == "PRIVMSG":
                        nick = pieces[0].split('!')[0][1:]
                        user = self.parent.user(nick)
                        chan = self.parent.channel(pieces[2])
                        msg = ' '.join(pieces[3:])[1:]
                        self.parsemsg(user, chan, msg)
+
                elif pieces[0] == "PING":
                        self.conn.send("PONG %s" % (pieces[1]))
+
                elif pieces[1] == "JOIN":
                        nick = pieces[0].split('!')[0][1:]
                        user = self.parent.user(nick)
@@ -47,18 +54,23 @@ class Bot(object):
        def parsemsg(self, user, chan, msg):
                if msg[0] == '!': #TODO check config for trigger
                        msg = msg[1:]
+
                else:
                        return
+
                pieces = msg.split()
                cmd = pieces[0].upper()
+
                if cmd == "EVAL":
                        try: ret = eval(' '.join(pieces[1:]))
                        except: self.msg(chan, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
                        else: self.msg(chan, "Done: %r" % (ret))
+
                elif cmd == "EXEC":
                        try: exec ' '.join(pieces[1:])
                        except: self.msg(chan, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
                        else: self.msg(chan, "Done.")
+
                #TODO
 
        def msg(self, target, msg):
@@ -68,10 +80,13 @@ class Bot(object):
                        if target[0] == '#': self.conn.send("PRIVMSG %s :%s" % (target, msg))
                        else: self.conn.send("NOTICE %s :%s" % (target, msg))
                else: raise TypeError('Bot.msg() "target" must be Erebus.User, Erebus.Channel, or string')
+
        def join(self, chan):
                self.conn.send("JOIN %s" % (chan))
+
        def part(self, chan):
                self.conn.send("PART %s" % (chan))
+
        def quit(self, reason="Shutdown"):
                self.conn.send("QUIT :%s" % (reason))
 
@@ -107,13 +122,17 @@ class BotConnection(object):
        def send(self, line):
                print self.nick, '[O]', line
                self.write(line)
+
        def write(self, line):
                self.socket.sendall(line+"\r\n")
+
        def read(self):
                self.buffer += self.socket.recv(8192)
                lines = []
+
                while '\r\n' in self.buffer:
                        pieces = self.buffer.split('\r\n', 1)
                        lines.append(pieces[0])
                        self.buffer = pieces[1]
+
                return lines

diff --git a/config.py b/config.py
index d4dfe5d81f4bda041aa0dae2114e9437f5a04f1d..c41e806bc78da21719d8cc833a2d156a124c5179 100644 (file)
--- a/config.py
+++ b/config.py
@@ -20,6 +20,7 @@ class Config(object):
        def write(self):
                with open(self._filename, 'wb') as configfile:
                        self.config.write(configfile)
+
        def __del__(self):
                if self.writeout: self.write()
 

diff --git a/erebus.py b/erebus.py
index 26f4dd4a982c2e7a402ccc8408c1439498ff9d89..bf8305f0bc421d8d32a6d2e66b4134a50a832c2c 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -13,14 +13,18 @@ class Erebus(object):
 
        class User(object):
                chans = []
+
                def __init__(self, nick, auth=None):
                        self.nick = nick
                        self.auth = auth
+
                        if auth is not None:
                                self.checklevel()
+
                def authed(self, auth):
                        self.auth = auth
                        self.checklevel()
+
                def checklevel(self): self.level = 9999 #TODO get level from db
                def __str__(self): return self.nick
                def __repr__(self): return "<User %r>" % (self.nick)
@@ -28,22 +32,29 @@ class Erebus(object):
                users = []
                voices = []
                ops = []
+
                def __init__(self, name):
                        self.name = name
+
                def userjoin(self, user, level=None):
                        if user not in self.users: self.users.append(user)
                        if level == 'op' and user not in self.ops: self.ops.append(user)
                        if level == 'voice' and user not in self.voices: self.voices.append(user)
+
                def userpart(self, user):
                        if user in self.ops: self.ops.remove(user)
                        if user in self.voices: self.voices.remove(user)
                        if user in self.users: self.users.remove(user)
+
                def userop(self, user):
                        if user in self.users and user not in self.ops: self.ops.append(user)
+
                def uservoice(self, user):
                        if user in self.users and user not in self.voices: self.voices.append(user)
+
                def userdeop(self, user):
                        if user in self.ops: self.ops.remove(user)
+
                def userdevoice(self, user):
                        if user in self.voices: self.voices.remove(user)
 
@@ -57,17 +68,21 @@ class Erebus(object):
                if bind is None: bind = ''
                obj = bot.Bot(self, nick, user, bind, server, port, realname, chans)
                self.bots[nick.lower()] = obj
+
        def newfd(self, obj, fileno):
                print "newfd(Erebus(), %r, %r)" % (obj, fileno)
                self.fds[fileno] = obj
                self.po.register(fileno, select.POLLIN)
+
        def bot(self, name):
                return self.bots[name.lower()]
+
        def fd(self, fileno):
                return self.fds[fileno]
 
        def user(self, nick): #TODO
                return self.User(nick.lower())
+
        def channel(self, name): #TODO
                return self.Channel(name.lower())
 
@@ -96,12 +111,12 @@ class Erebus(object):
 main = Erebus()
 
 def setup():
-       global bots, fds
        main.newbot('Erebus', 'erebus', None, 'irc.quakenet.org', 6667, 'Erebus', ['#dimetest'])
        main.bot('erebus').connect()
 
 def loop():
        poready = main.poll()
+
        for (fileno,mask) in poready:
                main.fd(fileno).getdata()