Add some database stuff to the core.

hamper/commander.py

@@ -5,9 +5,10 @@
 
 from twisted.words.protocols import irc
 from twisted.internet import protocol, reactor
+import sqlalchemy
+from sqlalchemy import orm
 
 from bravo.plugin import retrieve_plugins
-
 from hamper.IHamper import IPlugin
 
 
@@ -99,22 +100,30 @@ class CommanderFactory(protocol.ClientFactory):
 
     protocol = CommanderProtocol
 
-    def __init__(self, channel, nickname):
-        self.channel = channel
-        self.nickname = nickname
+    def __init__(self, config):
+        self.channel = config['channel']
+        self.nickname = config['nickname']
 
         self.history = {}
-
         self.plugins = set()
-        # These are so plugins can be added/removed at run time. The
-        # addition/removal will happen at a time when the set isn't being
-        # iterated, so nothing breaks.
+
         self.pluginsToAdd = set()
         self.pluginsToRemove = set()
 
+        if 'db' in config:
+            engine = sqlalchemy.create_engine(config['db'])
+        else:
+            engine = sqlalchemy.create_engine('sqlite:///:memory:')
+        self.DBSession = orm.sessionmaker(engine)
+
         for _, plugin in retrieve_plugins(IPlugin, 'hamper.plugins').items():
             self.registerPlugin(plugin)
 
+    def buildProtocol(self, addr):
+        p = protocol.ClientFactory.buildProtocol(self, addr)
+        p.db = self.DBSession()
+        return p
+
     def clientConnectionLost(self, connector, reason):
         print "Lost connection (%s)." % (reason)
 

hamper/main.py

@@ -17,5 +17,5 @@
             sys.exit();
 
     reactor.connectTCP(config['server'], config['port'],
-            CommanderFactory(config['channel'], config['nickname']))
+            CommanderFactory(config))
     reactor.run()

hamper/plugins/plugin_utils.py

@@ -1,4 +1,4 @@
-from zope.interface import implements, Interface, Attribute
+from zope.interface import implements
 
 from bravo import plugin