diff -u webber-0.1.2/webberbot.ini webber-0.1.2-sqlite/webberbot.ini --- webber-0.1.2/webberbot.ini 2003-05-23 07:27:59.000000000 +0100 +++ webber-0.1.2-sqlite/webberbot.ini 2007-05-29 14:50:10.000000000 +0100 @@ -5,8 +5,5 @@ password = bot resource = webberbot -[mysql] -server = localhost -dbname = webber -username = luser -password = mypass +[sqlite] +file = webber.db diff -u webber-0.1.2/webberbot.py webber-0.1.2-sqlite/webberbot.py --- webber-0.1.2/webberbot.py 2003-06-18 21:26:46.000000000 +0100 +++ webber-0.1.2-sqlite/webberbot.py 2007-05-29 14:48:52.000000000 +0100 @@ -21,11 +21,11 @@ import signal import os import ConfigParser -import MySQLdb +import sqlite import time DEBUG=0 -WEBBERBOTVERSION="0.1.2" +WEBBERBOTVERSION="0.1.2-sqlite" CONFIG="webberbot.ini" DEFAULTCUSTOMTEXT="foobar" @@ -49,7 +49,7 @@ print "Signal", signum, "received!" print "Shutting down connection to jabber server.." con.disconnect() - print "Closing MySQL database connection.." + print "Closing sqlite database connection.." db.close() sys.exit(0) @@ -58,20 +58,17 @@ signal.signal(signal.SIGTERM, shutdown) signal.signal(signal.SIGINT, shutdown) -def connectToMysqlServer(): +def connectToSqliteServer(): global db try: - Server=config.get("mysql","server") - DBName=config.get("mysql","dbname") - Username=config.get("mysql","username") - Password=config.get("mysql","password") + File=config.get("sqlite","file") except: - print "Couldn't read required fields (mysql) from config file." + print "Couldn't read required fields (sqlite) from config file." sys.exit(1) try: - db=MySQLdb.connect(host=Server,user=Username,passwd=Password,db=DBName) + db=sqlite.connect(File, autocommit=1) except: - print "Connection to MySQL database failed." + print "Connection to sqlite database failed." sys.exit(1) def connectToJabberServer(): @@ -193,7 +190,7 @@ musicstate=child.getData() print "Music Title: "+musictitle+" ("+musicstate+")" cur=db.cursor() - cur.execute("""REPLACE INTO pres VALUES (%s, %s, NOW(), %s, %s, %s, %s)""",(jid,priority,show,status,musictitle,musicstate)) + cur.execute("""REPLACE INTO pres VALUES (%s, %s, DATETIME('NOW'), %s, %s, %s, %s)""",(jid,priority,show,status,musictitle,musicstate)) cur.close() def updateConfig(jid,variable,value): @@ -271,6 +268,6 @@ connectSignalHandlers() timeout=5 readConfig() -connectToMysqlServer() +connectToSqliteServer() connectToJabberServer() botRun()