X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/d53d073b769249e44d1f55d0ddd037db2452fb03..f717c85633876497545e003d2aa3041b5dd07f19:/erebus.py

diff --git a/erebus.py b/erebus.py
index 0f6aaf8..953438b 100644
--- a/erebus.py
+++ b/erebus.py
@@ -6,8 +6,8 @@
 import os, sys, select, MySQLdb, MySQLdb.cursors, time, random
 import bot, config, ctlmod
 
-class Erebus(object):
-	APIVERSION = 1
+class Erebus(object): #singleton to pass around
+	APIVERSION = 2
 	RELEASE = 0
 
 	bots = {}
@@ -57,7 +57,7 @@ class Erebus(object):
 			return self.glevel
 
 		def join(self, chan):
-			self.chans.append(chan)
+			if chan not in self.chans: self.chans.append(chan)
 		def part(self, chan):
 			try:
 				self.chans.remove(chan)
@@ -204,6 +204,12 @@ class Erebus(object):
 	def module(self, name):
 		return ctlmod.modules[name]
 
+	def log(self, source, level, message):
+		print "%09.3f %s [%s] %s" % (time.time() % 100000, source, level, message)
+
+	def getuserbyauth(self, auth):
+		return [u for u in self.users.itervalues() if u.auth == auth.lower()]
+
 	#bind functions
 	def hook(self, word, handler):
 		try:
@@ -247,12 +253,18 @@ class Erebus(object):
 
 class MyCursor(MySQLdb.cursors.DictCursor):
 	def execute(self, *args, **kwargs):
-		print "%09.3f [SQL] [#] MyCursor.execute(self, %s, %s)" % (time.time() % 100000, ', '.join([repr(i) for i in args]), ', '.join([str(key)+"="+repr(kwargs[key]) for key in kwargs]))
+		if 'norecurse' in kwargs: norecurse = kwargs['norecurse']
+		else: norecurse = False
+		main.log("[SQL]", "?", "MyCursor.execute(self, %s, %s)" % (', '.join([repr(i) for i in args]), ', '.join([str(key)+"="+repr(kwargs[key]) for key in kwargs])))
+#		print "%09.3f [SQL] [#] MyCursor.execute(self, %s, %s)" % (time.time() % 100000, ', '.join([repr(i) for i in args]), ', '.join([str(key)+"="+repr(kwargs[key]) for key in kwargs]))
 		try:
-			super(self.__class__, self).execute(*args, **kwargs)
+			return super(self.__class__, self).execute(*args, **kwargs)
 		except MySQLdb.MySQLError as e:
-			print "%09.3f [SQL] [!] MySQL error! %r" % (time.time() % 100000, e)
-			dbsetup()
+			main.log("[SQL]", "!", "MySQL error! %r" % (e))
+#			print "%09.3f [SQL] [!] MySQL error! %r" % (time.time() % 100000, e)
+			if not norecurse:
+				dbsetup()
+				return self.execute(norecurse=True, *args, **kwargs)
 			return False
 		return True