X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/0956623592806f24abdcdf0c937e1dbdc31a38ac..b091071713e832e6c007e57b49d68e2a3b54f0ed:/modules/trivia.py

diff --git a/modules/trivia.py b/modules/trivia.py
index a72500d..0055c42 100644
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -27,7 +27,7 @@ def modstop(*args, **kwargs):
 	return lib.modstop(*args, **kwargs)
 
 # module code
-import json, random, threading, re, time, datetime
+import json, random, threading, re, time, datetime, os
 
 try:
 	import twitter
@@ -100,14 +100,44 @@ class TriviaState(object):
 	def __del__(self):
 		self.closeshop()
 	def closeshop(self):
-		if threading is not None and threading._Timer is not None:
-			if isinstance(self.steptimer, threading._Timer):
-				self.steptimer.cancel()
-			if isinstance(self.nextquestiontimer, threading._Timer):
-				self.nextquestiontimer.cancel()
-				self.nextquestiontimer = None
+		try:
+			self.steptimer.cancel()
+			self.steptimer = None
+		except: pass
+		try:
+			self.nextquestiontimer.cancel()
+			self.nextquestiontimer = None
+		except: pass
+#TODO remove if the replacement works
+#		if threading is not None and threading._Timer is not None:
+#			if isinstance(self.steptimer, threading._Timer):
+#				self.steptimer.cancel()
+#			if isinstance(self.nextquestiontimer, threading._Timer):
+#				self.nextquestiontimer.cancel()
+#				self.nextquestiontimer = None
+#		self.savedb()
+
+	def savedb(self): #returns whether or not it was able to save
 		if json is not None and json.dump is not None:
-			json.dump(self.db, open(self.questionfile, "w"))#, indent=4, separators=(',', ': '))
+#			json.dump(self.db, open(self.questionfile, "w"))#, indent=4, separators=(',', ': '))
+			dbjson = json.dumps(self.db)
+			if len(dbjson) > 0:
+				os.rename(self.questionfile, self.questionfile+".auto.bak")
+				tmpfn = os.tempnam('.', 'trivia')
+				try:
+					f = open(tmpfn, "w")
+					f.write(dbjson)
+					f.close()
+					os.rename(tmpfn, self.questionfile)
+					return True
+				except: #if something happens, restore the backup
+					os.rename(self.questionfile+".auto.bak", self.questionfile)
+					try:
+						os.unlink(tmpfn)
+					except OSError: # temp file is already gone
+						pass
+					raise #TODO: we may be better off just swallowing exceptions?
+		return False
 
 	def getchan(self):
 		return self.parent.channel(self.chan)
@@ -183,6 +213,7 @@ class TriviaState(object):
 			try: return str(self.db['users'][self.db['ranks'][num]]['points'])
 			except: return 0
 
+		status = False
 		try:
 			f = open(self.db['hofpath'], 'rb+')
 			for i in range(self.db['hoflines']): #skip this many lines
@@ -202,12 +233,12 @@ class TriviaState(object):
 				'thirdscore': pts(2),
 			})
 			f.write(fcontents)
-			return True
+			status = True
 		except Exception as e:
-			raise e #FIXME wtf???
-			return False
+			status = False
 		finally:
 			f.close()
+			return status
 
 	def endPointVote(self):
 		self.getchan().msg("Voting has ended!")
@@ -247,6 +278,8 @@ class TriviaState(object):
 		self.revealpossibilities = None
 		self.reveal = None
 
+		self.savedb()
+
 		if self.missedquestions > self.db['maxmissedquestions']:
 			stop()
 			self.getbot().msg(self.getchan(), "%d questions unanswered! Stopping the game." % (self.missedquestions))
@@ -288,7 +321,10 @@ class TriviaState(object):
 		qary = nextq[0].split(None)
 		qtext += " "
 		for qword in qary:
-			qtext += "\00304,01"+qword+"\00301,01"+chr(random.randrange(0x61,0x7A)) #a-z
+			spacer = random.choice(
+				range(0x61,0x7A) + ([0x20]*4)
+			)
+			qtext += "\00304,01"+qword+"\00301,01"+chr(spacer) #a-z
 		self.getbot().fastmsg(self.chan, qtext)
 
 		self.curq = nextq
@@ -360,11 +396,11 @@ class TriviaState(object):
 		if user in self.db['users']:
 			rank = self.db['users'][user]['rank']
 			if rank == 0:
-				return "N/A"
+				return ""
 			else:
-				return self.db['users'][self.db['ranks'][rank-1]]['points']
+				return "("+str(self.db['users'][self.db['ranks'][rank-1]]['points'])+")"
 		else:
-			return self.db['users'][self.db['ranks'][-1]]['points']
+			return "("+str(self.db['users'][self.db['ranks'][-1]]['points'])+")"
 
 state = TriviaState()
 
@@ -374,14 +410,26 @@ def trivia_checkanswer(bot, user, chan, *args):
 	if state.checkanswer(line):
 		state.curq = None
 		if state.hintanswer.lower() == line.lower():
-			bot.fastmsg(chan, "\00312%s\003 has it! The answer was \00312%s\003. New score: %d. Rank: %d. Target: %s (%s)." % (user, line, state.addpoint(user), state.rank(user), state.targetuser(user), state.targetpoints(user)))
+			bot.fastmsg(chan, "\00312%s\003 has it! The answer was \00312%s\003. New score: %d. Rank: %d. Target: %s %s" % (user, line, state.addpoint(user), state.rank(user), state.targetuser(user), state.targetpoints(user)))
 		else:
-			bot.fastmsg(chan, "\00312%s\003 has it! The answer was \00312%s\003 (hinted answer: %s). New score: %d. Rank: %d. Target: %s (%s)." % (user, line, state.hintanswer, state.addpoint(user), state.rank(user), state.targetuser(user), state.targetpoints(user)))
+			bot.fastmsg(chan, "\00312%s\003 has it! The answer was \00312%s\003 (hinted answer: %s). New score: %d. Rank: %d. Target: %s%s" % (user, line, state.hintanswer, state.addpoint(user), state.rank(user), state.targetuser(user), state.targetpoints(user)))
 		if state.hintsgiven == 0:
 			bot.msg(chan, "\00312%s\003 got an extra point for getting it before the hints! New score: %d." % (user, state.addpoint(user)))
 		state.nextquestion()
 
+@lib.hook(glevel=1, needchan=False)
+@lib.help(None, "saves the trivia database")
+def save(bot, user, chan, realtarget, *args):
+	if chan is not None and realtarget == chan.name: replyto = chan
+	else: replyto = user
+
+	if state.savedb():
+		bot.msg(replyto, "Save successful.")
+	else:
+		bot.msg(replyto, "Save failed!")
+
 @lib.hook(needchan=False)
+@lib.help("[<user>]", "shows how many points you or someone has")
 def points(bot, user, chan, realtarget, *args):
 	if chan is not None and realtarget == chan.name: replyto = chan
 	else: replyto = user
@@ -392,6 +440,7 @@ def points(bot, user, chan, realtarget, *args):
 	bot.msg(replyto, "%s has %d points." % (who, state.points(who)))
 
 @lib.hook(glevel=lib.STAFF, needchan=False)
+@lib.help("<user> [<amount>]", "gives someone points", "defaults to 1 point")
 @lib.argsGE(1)
 def give(bot, user, chan, realtarget, *args):
 	whoto = args[0]
@@ -404,6 +453,8 @@ def give(bot, user, chan, realtarget, *args):
 	bot.msg(chan, "%s gave %s %d points. New balance: %d" % (user, whoto, numpoints, balance))
 
 @lib.hook(glevel=1, needchan=False)
+@lib.help("<qid>", "sets next question to one in the database")
+@lib.argsEQ(1)
 def setnextid(bot, user, chan, realtarget, *args):
 	try:
 		qid = int(args[0])
@@ -417,6 +468,7 @@ def setnextid(bot, user, chan, realtarget, *args):
 		bot.msg(user, "Error: %s" % (e))
 
 @lib.hook(glevel=lib.STAFF, needchan=False)
+@lib.help("<q>*<a>", "sets next question to one not in database")
 @lib.argsGE(1)
 def setnext(bot, user, chan, realtarget, *args):
 	line = ' '.join([str(arg) for arg in args])
@@ -430,10 +482,12 @@ def setnext(bot, user, chan, realtarget, *args):
 	bot.msg(user, "Done.")
 
 @lib.hook(glevel=1, needchan=False)
+@lib.help(None, "skips to next question")
 def skip(bot, user, chan, realtarget, *args):
 	state.nextquestion(qskipped=True, skipwait=True)
 
 @lib.hook(needchan=False)
+@lib.help(None, "starts the trivia game")
 def start(bot, user, chan, realtarget, *args):
 	if chan is not None and realtarget == chan.name: replyto = chan
 	else: replyto = user
@@ -451,16 +505,13 @@ def start(bot, user, chan, realtarget, *args):
 		bot.msg(user, "Game is already started!")
 
 @lib.hook('stop', glevel=1, needchan=False)
+@lib.help(None, "stops the trivia game")
 def cmd_stop(bot, user, chan, realtarget, *args):
 	if stop():
 		bot.msg(state.chan, "Game stopped by %s" % (user))
 	else:
 		bot.msg(user, "Game isn't running.")
 
-@lib.hook('exception')
-def cmd_exception(*args, **kwargs):
-	raise Exception()
-
 def stop():
 	state.curq = None
 	state.nextq = None
@@ -477,6 +528,7 @@ def stop():
 	return True
 
 @lib.hook(needchan=False)
+@lib.help("<reason>", "reports a bad question to the admins")
 @lib.argsGE(1)
 def badq(bot, user, chan, realtarget, *args):
 	lastqid = state.lastqid
@@ -487,6 +539,7 @@ def badq(bot, user, chan, realtarget, *args):
 	bot.msg(user, "Reported bad question.")
 
 @lib.hook(glevel=lib.STAFF, needchan=False)
+@lib.help(None, "shows a list of BADQ reports")
 def badqs(bot, user, chan, realtarget, *args):
 	if len(state.db['badqs']) == 0:
 		bot.msg(user, "No reports.")
@@ -505,18 +558,24 @@ def badqs(bot, user, chan, realtarget, *args):
 			bot.msg(user, "- Exception: %r" % (e))
 
 @lib.hook(glevel=lib.STAFF, needchan=False)
+@lib.hook(None, "clears list of BADQ reports")
 def clearbadqs(bot, user, chan, realtarget, *args):
 	state.db['badqs'] = []
 	bot.msg(user, "Cleared reports.")
 
 @lib.hook(glevel=lib.STAFF, needchan=False)
+@lib.hook("<badqid>", "removes a BADQ report")
 @lib.argsEQ(1)
 def delbadq(bot, user, chan, realtarget, *args):
-	qid = int(args[0])
-	del state.db['badqs'][qid]
-	bot.msg(user, "Removed report #%d" % (qid))
+	try:
+		qid = int(args[0])
+		del state.db['badqs'][qid]
+		bot.msg(user, "Removed report #%d" % (qid))
+	except:
+		bot.msg(user, "Failed!")
 
 @lib.hook(needchan=False)
+@lib.help("[<user>]", "shows you or someone else's rank")
 def rank(bot, user, chan, realtarget, *args):
 	if chan is not None and realtarget == chan.name: replyto = chan
 	else: replyto = user
@@ -524,9 +583,10 @@ def rank(bot, user, chan, realtarget, *args):
 	if len(args) != 0: who = args[0]
 	else: who = user
 
-	bot.msg(replyto, "%s is in %d place (%s points). Target is: %s (%s points)." % (who, state.rank(who), state.points(who), state.targetuser(who), state.targetpoints(who)))
+	bot.msg(replyto, "%s is in %d place (%s points). Target is: %s %s" % (who, state.rank(who), state.points(who), state.targetuser(who), state.targetpoints(who)))
 
 @lib.hook(needchan=False)
+@lib.help(None, "shows top10 list")
 def top10(bot, user, chan, realtarget, *args):
 	if len(state.db['ranks']) == 0:
 		return bot.msg(state.db['chan'], "No one is ranked!")
@@ -538,6 +598,7 @@ def top10(bot, user, chan, realtarget, *args):
 	bot.msg(state.db['chan'], "Top 10: %s" % (replylist))
 
 @lib.hook(glevel=lib.ADMIN, needchan=False)
+@lib.help("<target score>", "changes the target score for this round")
 def settarget(bot, user, chan, realtarget, *args):
 	try:
 		state.db['target'] = int(args[0])
@@ -552,6 +613,7 @@ def settarget(bot, user, chan, realtarget, *args):
 		bot.msg(user, "Failed to set target.")
 
 @lib.hook(needchan=False)
+@lib.help("<option>", "votes for a trarget score for next round")
 def vote(bot, user, chan, realtarget, *args):
 	if state.pointvote is not None:
 		if int(args[0]) in state.voteamounts:
@@ -563,6 +625,7 @@ def vote(bot, user, chan, realtarget, *args):
 		bot.msg(user, "There's no vote in progress.")
 
 @lib.hook(glevel=lib.ADMIN, needchan=False)
+@lib.help("<number>", "sets the max missed question before game stops")
 def maxmissed(bot, user, chan, realtarget, *args):
 	try:
 		state.db['maxmissedquestions'] = int(args[0])
@@ -571,6 +634,7 @@ def maxmissed(bot, user, chan, realtarget, *args):
 		bot.msg(user, "Failed to set maxmissed.")
 
 @lib.hook(glevel=lib.ADMIN, needchan=False)
+@lib.help("<seconds>", "sets the time between hints")
 def hinttimer(bot, user, chan, realtarget, *args):
 	try:
 		state.db['hinttimer'] = float(args[0])
@@ -579,6 +643,7 @@ def hinttimer(bot, user, chan, realtarget, *args):
 		bot.msg(user, "Failed to set hint timer.")
 
 @lib.hook(glevel=lib.ADMIN, needchan=False)
+@lib.help("<number>", "sets the number of hints given")
 def hintnum(bot, user, chan, realtarget, *args):
 	try:
 		state.db['hintnum'] = int(args[0])
@@ -587,6 +652,7 @@ def hintnum(bot, user, chan, realtarget, *args):
 		bot.msg(user, "Failed to set hintnum.")
 
 @lib.hook(glevel=lib.ADMIN, needchan=False)
+@lib.help("<seconds>", "sets the pause between questions")
 def questionpause(bot, user, chan, realtarget, *args):
 	try:
 		state.db['questionpause'] = float(args[0])
@@ -595,12 +661,29 @@ def questionpause(bot, user, chan, realtarget, *args):
 		bot.msg(user, "Failed to set questionpause.")
 
 @lib.hook(glevel=1, needchan=False)
+@lib.help("<full question>", "finds a qid given a complete question")
 def findq(bot, user, chan, realtarget, *args):
+	if len(args) == 0:
+		bot.msg(user, "You need to specify the question.")
+		return
+
+	searchkey = ' '.join(args).lower()
+	matches = [str(i) for i in range(len(state.db['questions'])) if state.db['questions'][i][0].lower() == searchkey]
+	if len(matches) > 1:
+		bot.msg(user, "Multiple matches: %s" % (', '.join(matches)))
+	elif len(matches) == 1:
+		bot.msg(user, "One match: %s" % (matches[0]))
+	else:
+		bot.msg(user, "No match.")
+
+@lib.hook(glevel=1, needchan=False)
+@lib.help("<regex>", "finds a qid given a regex or partial question")
+def findqre(bot, user, chan, realtarget, *args):
 	if len(args) == 0:
 		bot.msg(user, "You need to specify a search string.")
 		return
 
-	searcher = re.compile(' '.join(args))
+	searcher = re.compile(' '.join(args), re.IGNORECASE)
 	matches = [str(i) for i in range(len(state.db['questions'])) if searcher.search(state.db['questions'][i][0]) is not None]
 	if len(matches) > 25:
 		bot.msg(user, "Too many matches! (>25)")
@@ -611,16 +694,33 @@ def findq(bot, user, chan, realtarget, *args):
 	else:
 		bot.msg(user, "No match.")
 
+@lib.hook(glevel=lib.STAFF, needchan=False)
+@lib.help("<qid>", "displays the q*a for a qid")
+def showq(bot, user, chan, realtarget, *args):
+	try:
+		qid = int(args[0])
+	except:
+		bot.msg(user, "Specify a numeric question ID.")
+		return
+	try:
+		q = state.db['questions'][qid]
+	except:
+		bot.msg(user, "ID not valid.")
+		return
+	bot.msg(user, "%s: %s*%s" % (qid, q[0], q[1]))
+
 @lib.hook(('delq', 'deleteq'), glevel=lib.STAFF, needchan=False)
+@lib.help("<qid>", "removes a question from the database")
 def delq(bot, user, chan, realtarget, *args):
 	try:
 		backup = state.db['questions'][int(args[0])]
 		del state.db['questions'][int(args[0])]
 		bot.msg(user, "Deleted %s*%s" % (backup[0], backup[1]))
 	except:
-		bot.msg(user, "Couldn't delete that question.")
+		bot.msg(user, "Couldn't delete that question. %r" % (e))
 
 @lib.hook(glevel=lib.STAFF, needchan=False)
+@lib.help("<q>*<a>", "adds a question")
 def addq(bot, user, chan, realtarget, *args):
 	line = ' '.join([str(arg) for arg in args])
 	linepieces = line.split('*')
@@ -641,23 +741,26 @@ def triviahelp(bot, user, chan, realtarget, *args):
 	bot.slowmsg(user,             "RANK          [<user>]")
 	bot.slowmsg(user,             "BADQ          <reason> (include info to identify question)")
 	if user.glevel >= 1:
-		bot.slowmsg(user,         "SKIP                            (>=KNOWN)")
-		bot.slowmsg(user,         "STOP                            (>=KNOWN)")
-		bot.slowmsg(user,         "FINDQ         <question>        (>=KNOWN)")
+		bot.slowmsg(user,         "SKIP                            (KNOWN)")
+		bot.slowmsg(user,         "STOP                            (KNOWN)")
+		bot.slowmsg(user,         "FINDQ         <full question>   (KNOWN)")
+		bot.slowmsg(user,         "FINDQRE       <regex>           (KNOWN)")
+		bot.slowmsg(user,         "SETNEXTID     <qid>             (KNOWN)")
 		if user.glevel >= lib.STAFF:
-			bot.slowmsg(user,     "GIVE          <user> [<points>] (>=STAFF)")
-			bot.slowmsg(user,     "SETNEXT       <q>*<a>           (>=STAFF)")
-			bot.slowmsg(user,     "ADDQ          <q>*<a>           (>=STAFF)")
-			bot.slowmsg(user,     "DELETEQ       <q>*<a>           (>=STAFF)  [aka DELQ]")
-			bot.slowmsg(user,     "BADQS                           (>=STAFF)")
-			bot.slowmsg(user,     "CLEARBADQS                      (>=STAFF)")
-			bot.slowmsg(user,     "DELBADQ       <reportid>        (>=STAFF)")
+			bot.slowmsg(user,     "GIVE          <user> [<points>] (STAFF)")
+			bot.slowmsg(user,     "SETNEXT       <q>*<a>           (STAFF)")
+			bot.slowmsg(user,     "ADDQ          <q>*<a>           (STAFF)")
+			bot.slowmsg(user,     "DELQ          <q>*<a>           (STAFF)  [aka DELETEQ]")
+			bot.slowmsg(user,     "SHOWQ         <qid>             (STAFF)")
+			bot.slowmsg(user,     "BADQS                           (STAFF)")
+			bot.slowmsg(user,     "CLEARBADQS                      (STAFF)")
+			bot.slowmsg(user,     "DELBADQ       <reportid>        (STAFF)")
 			if user.glevel >= lib.ADMIN:
-				bot.slowmsg(user, "SETTARGET     <points>          (>=ADMIN)")
-				bot.slowmsg(user, "MAXMISSED     <questions>       (>=ADMIN)")
-				bot.slowmsg(user, "HINTTIMER     <float seconds>   (>=ADMIN)")
-				bot.slowmsg(user, "HINTNUM       <hints>           (>=ADMIN)")
-				bot.slowmsg(user, "QUESTIONPAUSE <float seconds>   (>=ADMIN)")
+				bot.slowmsg(user, "SETTARGET     <points>          (ADMIN)")
+				bot.slowmsg(user, "MAXMISSED     <questions>       (ADMIN)")
+				bot.slowmsg(user, "HINTTIMER     <float seconds>   (ADMIN)")
+				bot.slowmsg(user, "HINTNUM       <hints>           (ADMIN)")
+				bot.slowmsg(user, "QUESTIONPAUSE <float seconds>   (ADMIN)")
 
 @lib.hooknum(417)
 def num_417(bot, textline):