]> jfr.im git - erebus.git/blobdiff - erebus.py
admin_config - add !getconfig, remove some unused functions
[erebus.git] / erebus.py
index 0377d92ded68ae4014a3546e917048ec4303bb2d..fb6fcc80fc703480887c2be351c368fb1a7e5669 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -6,8 +6,8 @@
 
 from __future__ import print_function
 
-import os, sys, select, MySQLdb, MySQLdb.cursors, time, random, gc
-import bot, config, ctlmod
+import os, sys, select, time, traceback, random, gc
+import bot, config, ctlmod, modlib
 
 class Erebus(object): #singleton to pass around
        APIVERSION = 0
@@ -18,17 +18,24 @@ class Erebus(object): #singleton to pass around
        numhandlers = {}
        msghandlers = {}
        chanhandlers = {}
+       exceptionhandlers = [] # list of (Exception_class, handler_function) tuples
        users = {}
        chans = {}
 
        class User(object):
                def __init__(self, nick, auth=None):
                        self.nick = nick
-                       self.auth = auth
+                       if auth is None:
+                               self.auth = None
+                       else:
+                               self.auth = auth.lower()
                        self.checklevel()
 
                        self.chans = []
 
+               def bind_bot(self, bot):
+                       return main._BoundUser(self, bot)
+
                def msg(self, *args, **kwargs):
                        main.randbot().msg(self, *args, **kwargs)
                def slowmsg(self, *args, **kwargs):
@@ -59,6 +66,23 @@ class Erebus(object): #singleton to pass around
                                        self.glevel = 0
                        return self.glevel
 
+               def setlevel(self, level, savetodb=True):
+                       if savetodb:
+                               if level != 0:
+                                       c = main.query("REPLACE INTO users (auth, level) VALUES (%s, %s)", (self.auth, level))
+                               else:
+                                       c = main.query("DELETE FROM users WHERE auth = %s", (self.auth,))
+                                       if c == 0: # no rows affected
+                                               c = True # is fine
+                               if c:
+                                       self.glevel = level
+                                       return True
+                               else:
+                                       return False
+                       else:
+                               self.glevel = level
+                               return True
+
                def join(self, chan):
                        if chan not in self.chans: self.chans.append(chan)
                def part(self, chan):
@@ -74,6 +98,22 @@ class Erebus(object): #singleton to pass around
                def __str__(self): return self.nick
                def __repr__(self): return "<User %r (%d)>" % (self.nick, self.glevel)
 
+       class _BoundUser(object):
+               def __init__(self, user, bot):
+                       self.__dict__['_bound_user'] = user
+                       self.__dict__['_bound_bot'] = bot
+               def __getattr__(self, name):
+                       return getattr(self._bound_user, name)
+               def __setattr__(self, name, value):
+                       setattr(self._bound_user, name, value)
+               def msg(self, *args, **kwargs):
+                       self._bound_bot.msg(self._bound_user, *args, **kwargs)
+               def slowmsg(self, *args, **kwargs):
+                       self._bound_bot.slowmsg(self._bound_user, *args, **kwargs)
+               def fastmsg(self, *args, **kwargs):
+                       self._bound_bot.fastmsg(self._bound_user, *args, **kwargs)
+               def __repr__(self): return "<_BoundUser %r %r>" % (self._bound_user, self._bound_bot)
+
        class Channel(object):
                def __init__(self, name, bot):
                        self.name = name
@@ -84,6 +124,8 @@ class Erebus(object): #singleton to pass around
                        self.voices = []
                        self.ops = []
 
+                       self.deleting = False # if true, the bot will remove cached records of this channel when the bot sees that it has left the channel
+
                        c = main.query("SELECT user, level FROM chusers WHERE chan = %s", (self.name,))
                        if c:
                                row = c.fetchone()
@@ -117,6 +159,9 @@ class Erebus(object): #singleton to pass around
                                        return True
                                else:
                                        return False
+                       else:
+                               self.levels[auth] = level
+                               return True
 
                def userjoin(self, user, level=None):
                        if user not in self.users: self.users.append(user)
@@ -151,30 +196,41 @@ class Erebus(object): #singleton to pass around
                        self.potype = "select"
                        self.fdlist = []
 
-       def query(self, *args, **kwargs):
-               if 'noretry' in kwargs:
-                       noretry = kwargs['noretry']
-                       del kwargs['noretry']
-               else:
-                       noretry = False
+       def query(self, sql, parameters=[], noretry=False):
+               # Callers use %s-style (paramstyle='format') placeholders in queries.
+               # There's no provision for a literal '%s' present inside the query; stuff it in a parameter instead.
+               if db_api.paramstyle == 'format' or db_api.paramstyle == 'pyformat': # mysql, postgresql
+                       # psycopg actually asks for a mapping with %(name)s style (pyformat) but it will accept %s style.
+                       pass
+               elif db_api.paramstyle == 'qmark': # sqlite doesn't like %s style.
+                       parameters = [str(p) for p in parameters]
+                       sql = sql.replace('%s', '?') # hope that wasn't literal, oopsie
+
+               log_noretry = ''
+               if noretry:
+                       log_noretry = ', noretry=True'
+               self.log("[SQL]", "?", "query(%r, %r%s)" % (sql, parameters, log_noretry))
 
-               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)
+                       res = curs.execute(sql, parameters)
                        if res:
                                return curs
                        else:
                                return res
-               except MySQLdb.MySQLError as e:
-                       self.log("[SQL]", "!", "MySQL error! %r" % (e))
+               except db_api.DataError as e:
+                       self.log("[SQL]", ".", "DB DataError: %r" % (e))
+                       return False
+               except db_api.Error as e:
+                       self.log("[SQL]", "!", "DB error! %r" % (e))
                        if not noretry:
                                dbsetup()
-                               return self.query(*args, noretry=True, **kwargs)
+                               return self.query(sql, parameters, noretry=True)
                        else:
                                raise e
 
        def querycb(self, cb, *args, **kwargs):
+               # TODO this should either get thrown out with getdb()/returndb(), or else be adjusted to make use of it.
                def run_query():
                        cb(self.query(*args, **kwargs))
                threading.Thread(target=run_query).start()
@@ -185,11 +241,19 @@ class Erebus(object): #singleton to pass around
                self.bots[nick.lower()] = obj
 
        def newfd(self, obj, fileno):
+               if not isinstance(obj, modlib.Socketlike):
+                       raise Exception('Attempted to hook a socket without a class to process data')
                self.fds[fileno] = obj
                if self.potype == "poll":
                        self.po.register(fileno, select.POLLIN)
                elif self.potype == "select":
                        self.fdlist.append(fileno)
+       def delfd(self, fileno):
+               del self.fds[fileno]
+               if self.potype == "poll":
+                       self.po.unregister(fileno)
+               elif self.potype == "select":
+                       self.fdlist.remove(fileno)
 
        def bot(self, name): #get Bot() by name (nick)
                return self.bots[name.lower()]
@@ -198,17 +262,17 @@ class Erebus(object): #singleton to pass around
        def randbot(self): #get Bot() randomly
                return self.bots[random.choice(list(self.bots.keys()))]
 
-       def user(self, _nick, justjoined=False, create=True):
+       def user(self, _nick, send_who=False, create=True):
                nick = _nick.lower()
+
+               if send_who and (nick not in self.users or not self.users[nick].isauthed()):
+                       self.randbot().conn.send("WHO %s n%%ant,1" % (nick))
+
                if nick in self.users:
                        return self.users[nick]
                elif create:
                        user = self.User(_nick)
                        self.users[nick] = user
-
-                       if justjoined:
-                               self.randbot().conn.send("WHO %s n%%ant,1" % (nick))
-
                        return user
                else:
                        return None
@@ -246,7 +310,9 @@ class Erebus(object): #singleton to pass around
                return [u for u in self.users.values() if u.auth == auth.lower()]
 
        def getdb(self):
-               """Get a DB object. The object must be returned to the pool after us, using returndb()."""
+               """Get a DB object. The object must be returned to the pool after us, using returndb(). This is intended for use from child threads.
+                       It should probably be treated as deprecated though. Where possible new modules should avoid using threads.
+                       In the future, timers will be provided (manipulating the timeout_seconds of the poll() method), and that should mostly be used in place of threading."""
                return self.dbs.pop()
 
        def returndb(self, db):
@@ -292,13 +358,42 @@ class Erebus(object): #singleton to pass around
        def getchanhook(self, chan):
                return self.chanhandlers[chan]
 
+       def hookexception(self, exc, handler):
+               self.exceptionhandlers.append((exc, handler))
+       def unhookexception(self, exc, handler):
+               self.exceptionhandlers.remove((exc, handler))
+       def hasexceptionhook(self, exc):
+               return any((True for x,h in self.exceptionhandlers if isinstance(exc, x)))
+       def getexceptionhook(self, exc):
+               return (h for x,h in self.exceptionhandlers if isinstance(exc, x))
+
 
 def dbsetup():
        main.db = None
        main.dbs = []
+       dbtype = cfg.get('erebus', 'dbtype', 'mysql')
+       if dbtype == 'mysql':
+               _dbsetup_mysql()
+       elif dbtype == 'sqlite':
+               _dbsetup_sqlite()
+       else:
+               main.log('*', '!', 'Unknown dbtype in config: %s' % (dbtype))
+
+def _dbsetup_mysql():
+       global db_api
+       import MySQLdb as db_api, MySQLdb.cursors
        for i in range(cfg.get('erebus', 'num_db_connections', 2)-1):
-               main.dbs.append(MySQLdb.connect(host=cfg.dbhost, user=cfg.dbuser, passwd=cfg.dbpass, db=cfg.dbname, cursorclass=MySQLdb.cursors.DictCursor))
-       main.db = MySQLdb.connect(host=cfg.dbhost, user=cfg.dbuser, passwd=cfg.dbpass, db=cfg.dbname, cursorclass=MySQLdb.cursors.DictCursor)
+               main.dbs.append(db_api.connect(host=cfg.dbhost, user=cfg.dbuser, passwd=cfg.dbpass, db=cfg.dbname, cursorclass=MySQLdb.cursors.DictCursor))
+       main.db = db_api.connect(host=cfg.dbhost, user=cfg.dbuser, passwd=cfg.dbpass, db=cfg.dbname, cursorclass=MySQLdb.cursors.DictCursor)
+
+def _dbsetup_sqlite():
+       global db_api
+       import sqlite3 as db_api
+       for i in range(cfg.get('erebus', 'num_db_connections', 2)):
+               main.db = db_api.connect(cfg.dbhost)
+               main.db.row_factory = db_api.Row
+               main.db.isolation_level = None
+               main.dbs.append(main.db)
 
 def setup():
        global cfg, main
@@ -330,8 +425,23 @@ def setup():
 def loop():
        poready = main.poll()
        for fileno in poready:
-               for line in main.fd(fileno).getdata():
-                       main.fd(fileno).parse(line)
+               try:
+                       data = main.fd(fileno).getdata()
+               except:
+                       main.log('*', '!', 'Error receiving data: getdata raised exception for socket %d, closing' % (fileno))
+                       traceback.print_exc()
+                       data = None
+               if data is None:
+                       main.fd(fileno).close()
+               else:
+                       for line in data:
+                               if cfg.getboolean('debug', 'io'):
+                                       main.log(str(main.fd(fileno)), 'I', line)
+                               try:
+                                       main.fd(fileno).parse(line)
+                               except:
+                                       main.log('*', '!', 'Error receiving data: parse raised exception for socket %d data %r, ignoring' % (fileno, line))
+                                       traceback.print_exc()
        if main.mustquit is not None:
                main.log('*', '!', 'Core exiting due to: %s' % (main.mustquit))
                raise main.mustquit