Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-07 19:49:23 +01:00
Code Issues Projects Releases Wiki Activity

get messageparser to use sqlite3. should work now....

Browse Source
This commit is contained in:
Daniel Folkinshteyn 2010-03-15 20:06:24 -04:00
parent 3326212d55
commit f8ddba0d15
1 changed files with 52 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
plugins/MessageParser/plugin.py
View File

@ -41,13 +41,18 @@ import re
import os import os
import time import time
try: #try:
import sqlite #import sqlite
except ImportError: #except ImportError:
raise callbacks.Error, 'You need to have PySQLite installed to use this ' \ #raise callbacks.Error, 'You need to have PySQLite installed to use this ' \
'plugin. Download it at ' \ #'plugin. Download it at ' \
'<http://code.google.com/p/pysqlite/>' #'<http://code.google.com/p/pysqlite/>'
import sqlite3
# these are needed cuz we are overriding getdb
import threading
import supybot.world as world
class MessageParser(callbacks.Plugin, plugins.ChannelDBHandler): class MessageParser(callbacks.Plugin, plugins.ChannelDBHandler):
"""This plugin can set regexp triggers to activate the bot. """This plugin can set regexp triggers to activate the bot.
@ -58,9 +63,10 @@ class MessageParser(callbacks.Plugin, plugins.ChannelDBHandler):
plugins.ChannelDBHandler.__init__(self) plugins.ChannelDBHandler.__init__(self)
def makeDb(self, filename): def makeDb(self, filename):
"""Create the database and connect to it."""
if os.path.exists(filename): if os.path.exists(filename):
return sqlite.connect(filename) return sqlite3.connect(filename)
db = sqlite.connect(filename) db = sqlite3.connect(filename)
cursor = db.cursor() cursor = db.cursor()
cursor.execute("""CREATE TABLE triggers ( cursor.execute("""CREATE TABLE triggers (
id INTEGER PRIMARY KEY, id INTEGER PRIMARY KEY,
@ -74,15 +80,29 @@ class MessageParser(callbacks.Plugin, plugins.ChannelDBHandler):
db.commit() db.commit()
return db return db
# override this because sqlite3 doesn't have autocommit
# use isolation_level instead.
def getDb(self, channel):
"""Use this to get a database for a specific channel."""
currentThread = threading.currentThread()
if channel not in self.dbCache and currentThread == world.mainThread:
self.dbCache[channel] = self.makeDb(self.makeFilename(channel))
if currentThread != world.mainThread:
db = self.makeDb(self.makeFilename(channel))
else:
db = self.dbCache[channel]
db.isolation_level = None
return db
def _updateRank(self, channel, regexp): def _updateRank(self, channel, regexp):
if self.registryValue('keepRankInfo', channel): if self.registryValue('keepRankInfo', channel):
db = self.getDb(channel) db = self.getDb(channel)
cursor = db.cursor() cursor = db.cursor()
cursor.execute("""SELECT usage_count cursor.execute("""SELECT usage_count
FROM triggers FROM triggers
WHERE regexp=%s""", regexp) WHERE regexp=?""", (regexp,))
old_count = cursor.fetchall()[0][0] old_count = cursor.fetchall()[0][0]
cursor.execute("UPDATE triggers SET usage_count=%s WHERE regexp=%s", old_count + 1, regexp) cursor.execute("UPDATE triggers SET usage_count=? WHERE regexp=?", (old_count + 1, regexp,))
db.commit() db.commit()
def doPrivmsg(self, irc, msg): def doPrivmsg(self, irc, msg):
@ -94,9 +114,10 @@ class MessageParser(callbacks.Plugin, plugins.ChannelDBHandler):
db = self.getDb(channel) db = self.getDb(channel)
cursor = db.cursor() cursor = db.cursor()
cursor.execute("SELECT regexp, action FROM triggers") cursor.execute("SELECT regexp, action FROM triggers")
if cursor.rowcount == 0: results = cursor.fetchall()
if len(results) == 0:
return return
for (regexp, action) in cursor.fetchall(): for (regexp, action) in results:
match = re.search(regexp, msg.args[1]) match = re.search(regexp, msg.args[1])
if match is not None: if match is not None:
self._updateRank(channel, regexp) self._updateRank(channel, regexp)
@ -116,9 +137,10 @@ class MessageParser(callbacks.Plugin, plugins.ChannelDBHandler):
etc. being interpolated from the regexp match groups.""" etc. being interpolated from the regexp match groups."""
db = self.getDb(channel) db = self.getDb(channel)
cursor = db.cursor() cursor = db.cursor()
cursor.execute("SELECT id, locked FROM triggers WHERE regexp=%s", regexp) cursor.execute("SELECT id, locked FROM triggers WHERE regexp=?", (regexp,))
if cursor.rowcount != 0: results = cursor.fetchall()
(id, locked) = map(int, cursor.fetchone()) if len(results) != 0:
(id, locked) = map(int, results[0])
else: else:
locked = False locked = False
#capability = ircdb.makeChannelCapability(channel, 'factoids') #capability = ircdb.makeChannelCapability(channel, 'factoids')
@ -128,8 +150,8 @@ class MessageParser(callbacks.Plugin, plugins.ChannelDBHandler):
else: else:
name = msg.nick name = msg.nick
cursor.execute("""INSERT INTO triggers VALUES cursor.execute("""INSERT INTO triggers VALUES
(NULL, %s, %s, %s, %s, %s, %s)""", (NULL, ?, ?, ?, ?, ?, ?)""",
regexp, name, int(time.time()), 0, action, 0) (regexp, name, int(time.time()), 0, action, 0,))
db.commit() db.commit()
irc.replySuccess() irc.replySuccess()
else: else:
@ -146,9 +168,10 @@ class MessageParser(callbacks.Plugin, plugins.ChannelDBHandler):
""" """
db = self.getDb(channel) db = self.getDb(channel)
cursor = db.cursor() cursor = db.cursor()
cursor.execute("SELECT id, locked FROM triggers WHERE regexp=%s", regexp) cursor.execute("SELECT id, locked FROM triggers WHERE regexp=?", (regexp,))
if cursor.rowcount != 0: results = cursor.fetchall()
(id, locked) = map(int, cursor.fetchone()) if len(results) != 0:
(id, locked) = map(int, results[0])
else: else:
irc.reply('There is no such regexp trigger.') irc.reply('There is no such regexp trigger.')
return return
@ -157,7 +180,7 @@ class MessageParser(callbacks.Plugin, plugins.ChannelDBHandler):
irc.reply('This regexp trigger is locked.') irc.reply('This regexp trigger is locked.')
return return
cursor.execute("""DELETE FROM triggers WHERE id=%s""", id) cursor.execute("""DELETE FROM triggers WHERE id=?""", (id,))
db.commit() db.commit()
irc.replySuccess() irc.replySuccess()
remove = wrap(remove, ['channel', 'something']) remove = wrap(remove, ['channel', 'something'])
@ -171,9 +194,10 @@ class MessageParser(callbacks.Plugin, plugins.ChannelDBHandler):
""" """
db = self.getDb(channel) db = self.getDb(channel)
cursor = db.cursor() cursor = db.cursor()
cursor.execute("SELECT regexp, action FROM triggers WHERE regexp=%s", regexp) cursor.execute("SELECT regexp, action FROM triggers WHERE regexp=?", (regexp,))
if cursor.rowcount != 0: results = cursor.fetchall()
(regexp, action) = cursor.fetchone() if len(results) != 0:
(regexp, action) = results[0]
else: else:
irc.reply('There is no such regexp trigger.') irc.reply('There is no such regexp trigger.')
return return
@ -191,8 +215,9 @@ class MessageParser(callbacks.Plugin, plugins.ChannelDBHandler):
db = self.getDb(channel) db = self.getDb(channel)
cursor = db.cursor() cursor = db.cursor()
cursor.execute("SELECT regexp FROM triggers") cursor.execute("SELECT regexp FROM triggers")
if cursor.rowcount != 0: results = cursor.fetchall()
regexps = cursor.fetchall() if len(results) != 0:
regexps = results
else: else:
irc.reply('There are no regexp triggers in the database.') irc.reply('There are no regexp triggers in the database.')
return return
@ -215,7 +240,7 @@ class MessageParser(callbacks.Plugin, plugins.ChannelDBHandler):
cursor.execute("""SELECT regexp, usage_count cursor.execute("""SELECT regexp, usage_count
FROM triggers FROM triggers
ORDER BY usage_count DESC ORDER BY usage_count DESC
LIMIT %s""", numregexps) LIMIT ?""", (numregexps,))
regexps = cursor.fetchall() regexps = cursor.fetchall()
s = [ "#%d %s (%d)" % (i+1, regexp[0], regexp[1]) for i, regexp in enumerate(regexps) ] s = [ "#%d %s (%d)" % (i+1, regexp[0], regexp[1]) for i, regexp in enumerate(regexps) ]
irc.reply(", ".join(s)) irc.reply(", ".join(s))