Update to use new-style db abstractions, some super stuff.

plugins/Dunno.py

@@ -66,31 +66,32 @@ conf.registerChannelValue(conf.supybot.plugins.Dunno, 'prefixNick',
     registry.Boolean(True, """Determines whether the bot will prefix the nick
     of the user giving an invalid command to the "dunno" response."""))
 
-class DbiDunnoDB(object):
+class DunnoRecord(object):
-    class DunnoDB(dbi.DB):
-        class Record(object):
     __metaclass__ = dbi.Record
     __fields__ = [
         'at',
         'by',
         'text',
         ]
-    def __init__(self):
+
-        self.filenames = sets.Set()
+class DbiDunnoDB(object):
+    class DunnoDB(dbi.DB):
+        Record = DunnoRecord
+
+    def __init__(self, filename):
+        self.dbs = ircutils.IrcDict()
+        self.filename = filename
 
     def _getDb(self, channel):
-        # Why cache?  It gains very little.
+        filename = plugins.makeChannelFilename(self.filename, channel)
-        filename = plugins.makeChannelFilename('Dunno.db', channel)
+        if channel in self.dbs:
-        self.filenames.add(filename)
+            return self.dbs[channel]
-        return self.DunnoDB(filename)
+        self.dbs[channel] = self.DunnoDB(filename)
+        return self.dbs[channel]
 
     def close(self):
-        for filename in self.filenames:
+        for db in self.dbs.itervalues():
-            try:
-                db = self.DunnoDB(filename)
             db.close()
-            except EnvironmentError:
-                pass
 
     def flush(self):
         pass
@@ -128,8 +129,8 @@ class DbiDunnoDB(object):
         except EnvironmentError, e:
             return 0
 
-def DunnoDB():
+DunnoDB = plugins.DB('Dunno',
-    return DbiDunnoDB()
+                     {'flat': DbiDunnoDB})
 
 class Dunno(callbacks.Privmsg):
     """This plugin was written initially to work with MoobotFactoids, the two
@@ -139,11 +140,12 @@ class Dunno(callbacks.Privmsg):
     responses."""
     callAfter = ['MoobotFactoids']
     def __init__(self):
-        callbacks.Privmsg.__init__(self)
+        super(Dunno, self).__init__()
         self.db = DunnoDB()
 
     def die(self):
         self.db.close()
+        super(Dunno, self).die()
 
     def invalidCommand(self, irc, msg, tokens):
         channel = msg.args[0]

plugins/FunDB.py

@@ -54,35 +54,33 @@ import supybot.privmsgs as privmsgs
 import supybot.registry as registry
 import supybot.callbacks as callbacks
 
-class DbiFunDBDB(object):
+class FunDBRecord(object):
-    class FunDBDB(dbi.DB):
-        class Record(object):
     __metaclass__ = dbi.Record
     __fields__ = [
         'by',
         'text',
         ]
 
-    def __init__(self):
+class DbiFunDBDB(object):
+    class FunDBDB(dbi.DB):
+        Record = FunDBRecord
+
+    def __init__(self, filename):
         self.dbs = ircutils.IrcDict()
-        self.filenames = sets.Set()
+        self.filename = filename
 
     def close(self):
-        for filename in self.filenames:
+        for type in self.dbs.itervalues():
-            try:
+            for db in type.itervalues():
-                db = self.FunDBDB(filename)
                 db.close()
-            except EnvironmentError:
-                pass
 
     def _getDb(self, channel, type):
         type = type.lower()
         if channel not in self.dbs:
             self.dbs[channel] = {}
         if type not in self.dbs[channel]:
-            filename = type.capitalize() + '.db'
+            filename = self.filename.replace('db', '%s.db' % type.capitalize())
             filename = plugins.makeChannelFilename(filename, channel)
-            self.filenames.add(filename)
             self.dbs[channel][type] = self.FunDBDB(filename)
         return self.dbs[channel][type]
 
@@ -112,8 +110,8 @@ class DbiFunDBDB(object):
         db = self._getDb(channel, type)
         return itertools.ilen(db)
 
-def FunDBDB():
+FunDBDB = plugins.DB('FunDB',
-    return DbiFunDBDB()
+                     {'flat': DbiFunDBDB})
 
 conf.registerPlugin('FunDB')
 conf.registerChannelValue(conf.supybot.plugins.FunDB, 'showIds',
@@ -127,11 +125,12 @@ class FunDB(callbacks.Privmsg):
     """
     _types = ('insult', 'lart', 'praise')
     def __init__(self):
-        callbacks.Privmsg.__init__(self)
+        super(FunDB, self).__init__()
         self.db = FunDBDB()
 
     def die(self):
         self.db.close()
+        super(FunDB, self).die()
 
     def _getBy(self, by):
         try:

plugins/Herald.py

@@ -88,7 +88,7 @@ conf.registerChannelValue(conf.supybot.plugins.Herald, 'throttleTimeAfterPart',
 
 class Herald(callbacks.Privmsg):
     def __init__(self):
-        callbacks.Privmsg.__init__(self)
+        super(Herald, self).__init__()
         self.db = HeraldDB(filename)
         world.flushers.append(self.db.flush)
         self.lastParts = plugins.ChannelUserDictionary()
@@ -98,7 +98,7 @@ class Herald(callbacks.Privmsg):
         if self.db.flush in world.flushers:
             world.flushers.remove(self.db.flush)
         self.db.close()
-        callbacks.Privmsg.die(self)
+        super(Herald, self).die()
 
     def doJoin(self, irc, msg):
         channel = msg.args[0]

plugins/Infobot.py

@@ -385,6 +385,7 @@ class Infobot(callbacks.PrivmsgCommandAndRegexp):
         self.addressed = False
 
     def die(self):
+        super(Infobot, self).die()
         self.db.close()
 
     def _error(self, s):

plugins/Karma.py

@@ -227,10 +227,11 @@ KarmaDB = plugins.DB('Karma',
 class Karma(callbacks.Privmsg):
     callBefore = ('Factoids', 'MoobotFactoids', 'Infobot')
     def __init__(self):
-        self.db = KarmaDB()
         super(Karma, self).__init__()
+        self.db = KarmaDB()
 
     def die(self):
+        super(Karma, self).die()
         self.db.close()
 
     def _normalizeThing(self, thing):

plugins/Note.py

@@ -36,14 +36,13 @@ users that can be retrieved later.
 
 __revision__ = "$Id$"
 
-import supybot.plugins as plugins
-
 import csv
 import sets
 import time
 import getopt
 import os.path
 import operator
+
 from itertools import imap
 
 import supybot.dbi as dbi
@@ -83,9 +82,7 @@ class Ignores(registry.SpaceSeparatedListOfStrings):
 
 conf.registerUserValue(conf.users.plugins.Note, 'ignores', Ignores([], ''))
 
-class DbiNoteDB(dbi.DB):
+class NoteRecord(object):
-    Mapping = 'flat'
-    class Record(object):
     __metaclass__ = dbi.Record
     __fields__ = [
         'frm',
@@ -97,6 +94,10 @@ class DbiNoteDB(dbi.DB):
         'text',
         ]
 
+class DbiNoteDB(dbi.DB):
+    Mapping = 'flat'
+    Record = NoteRecord
+
     def __init__(self, *args, **kwargs):
         dbi.DB.__init__(self, *args, **kwargs)
         self.unRead = {}
@@ -156,17 +157,15 @@ class DbiNoteDB(dbi.DB):
 
 
 NoteDB = plugins.DB('Note', {'flat': DbiNoteDB})
-## def NoteDB():
-##     # XXX This should eventually be smarter.
-##     return DbiNoteDB(conf.supybot.directories.data.dirize('Note.db'))
 
 
 class Note(callbacks.Privmsg):
     def __init__(self):
-        callbacks.Privmsg.__init__(self)
+        super(Note, self).__init__()
         self.db = NoteDB()
 
     def die(self):
+        super(Note, self).die()
         self.db.close()
 
     def doPrivmsg(self, irc, msg):

plugins/Quotes.py

@@ -35,8 +35,6 @@ Maintains a Quotes database for each channel.
 
 __revision__ = "$Id$"
 
-import supybot.plugins as plugins
-
 import re
 import time
 import getopt
@@ -46,16 +44,12 @@ import supybot.dbi as dbi
 import supybot.conf as conf
 import supybot.utils as utils
 import supybot.ircdb as ircdb
+import supybot.plugins as plugins
+import supybot.ircutils as ircutils
 import supybot.privmsgs as privmsgs
 import supybot.registry as registry
 import supybot.callbacks as callbacks
 
-try:
-    import sqlite
-except ImportError:
-    raise callbacks.Error, 'You need to have PySQLite installed to use this '\
-                           'plugin.  Download it at <http://pysqlite.sf.net/>'
-
 conf.registerPlugin('Quotes')
 conf.registerGlobalValue(conf.supybot.plugins.Quotes, 'requireRegistration',
     registry.Boolean(False, """Determines whether the bot should require people
@@ -81,13 +75,31 @@ class QuoteRecord(object):
                 time.strftime(format, time.localtime(float(self.at))))
 
 class SqliteQuotesDB(object):
+    def __init__(self, filename):
+        self.dbs = ircutils.IrcDict()
+        self.filename = filename
+
+    def close(self):
+        for db in self.dbs.itervalues():
+            db.close()
+
     def _getDb(self, channel):
-        filename = plugins.makeChannelFilename('Quotes.db', channel)
+        try:
+            import sqlite
+        except ImportError:
+            raise callbacks.Error, 'You need to have PySQLite installed to ' \
+                                   'use this plugin.  Download it at ' \
+                                   '<http://pysqlite.sf.net/>'
+        filename = plugins.makeChannelFilename(self.filename, channel)
+        if channel in self.dbs:
+            return self.dbs[channel]
         if os.path.exists(filename):
-            return sqlite.connect(db=filename, mode=0755,
+            self.dbs[channel] = sqlite.connect(db=filename, mode=0755,
                                                converters={'bool': bool})
+            return self.dbs[channel]
         #else:
         db = sqlite.connect(db=filename, mode=0755, coverters={'bool': bool})
+        self.dbs[channel] = db
         cursor = db.cursor()
         cursor.execute("""CREATE TABLE quotes (
                           id INTEGER PRIMARY KEY,
@@ -184,13 +196,17 @@ class SqliteQuotesDB(object):
             raise dbi.NoRecordError, id
         db.commit()
 
-def QuotesDB():
+QuotesDB = plugins.DB('Quotes',
-    return SqliteQuotesDB()
+                      {'sqlite': SqliteQuotesDB})
 
 class Quotes(callbacks.Privmsg):
     def __init__(self):
+        super(Quotes, self).__init__()
         self.db = QuotesDB()
-        callbacks.Privmsg.__init__(self)
+
+    def die(self):
+        super(Quotes, self).die()
+        self.db.close()
 
     def add(self, irc, msg, args):
         """[<channel>] <quote>

plugins/Seen.py

@@ -35,8 +35,6 @@ Keeps track of the last time a user was seen on a channel.
 
 __revision__ = "$Id$"
 
-import supybot.plugins as plugins
-
 import os
 import re
 import sets
@@ -88,7 +86,7 @@ class Seen(callbacks.Privmsg):
     def __init__(self):
         self.db = SeenDB(filename)
         world.flushers.append(self.db.flush)
-        callbacks.Privmsg.__init__(self)
+        super(Seen, self).__init__()
 
     def die(self):
         if self.db.flush in world.flushers:
@@ -96,7 +94,7 @@ class Seen(callbacks.Privmsg):
         else:
             self.log.debug('Odd, no flush in flushers: %r', world.flushers)
         self.db.close()
-        callbacks.Privmsg.die(self)
+        super(Seen, self).die()
 
     def doPrivmsg(self, irc, msg):
         if ircutils.isChannel(msg.args[0]):

plugins/WordStats.py

@@ -178,7 +178,7 @@ filename=os.path.join(conf.supybot.directories.data(), 'WordStats.db')
 class WordStats(callbacks.Privmsg):
     noIgnore = True
     def __init__(self):
-        callbacks.Privmsg.__init__(self)
+        super(WordStats, self).__init__()
         self.db = WordStatsDB(filename)
         self.queried = False
         world.flushers.append(self.db.flush)
@@ -187,7 +187,7 @@ class WordStats(callbacks.Privmsg):
         if self.db.flush in world.flushers:
             world.flushers.remove(self.db.flush)
         self.db.close()
-        callbacks.Privmsg.die(self)
+        super(WordStats, self).die()
 
     def callCommand(self, *args, **kwargs):
         self.queried = True