X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/bcb6dc21a0293eeab4987147e96c451873049ce9..58cd01915145ccfc90db81073a2d5451630562ac:/modules/trivia.py diff --git a/modules/trivia.py b/modules/trivia.py index 4732a1b..cf67a2a 100644 --- a/modules/trivia.py +++ b/modules/trivia.py @@ -10,8 +10,8 @@ modinfo = { 'author': 'Erebus Team', 'license': 'public domain', 'compatible': [0], - 'depends': ['userinfo'], - 'softdeps': ['help'], + 'depends': [], + 'softdeps': ['help','userinfo'], } # preamble @@ -35,8 +35,11 @@ import json, random, threading, re, time, datetime, os, sys if sys.version_info.major < 3: timerbase = threading._Timer + stringbase = basestring else: + import tempfile timerbase = threading.Timer + stringbase = str try: @@ -65,7 +68,10 @@ def pts(num): return 0 def country(num, default="??"): - return lib.mod('userinfo').get(person(num), 'country', default=default).upper() + try: + return lib.mod('userinfo').get(person(num), 'country', default=default).upper() + except KeyError: + return default.upper() class MyTimer(timerbase): def __init__(self, *args, **kwargs): @@ -74,6 +80,8 @@ class MyTimer(timerbase): class TriviaState(object): def __init__(self, parent=None, pointvote=False): + self.streak = 0 + self.streak_holder = None if parent is not None: self.gotParent(parent, pointvote) @@ -125,11 +133,17 @@ class TriviaState(object): if json is not None and json.dump is not None: # json.dump(self.db, open(self.questionfile, "w"))#, indent=4, separators=(',', ': ')) dbjson = json.dumps(self.db) + # we have to do a dance to save the file to make the update atomic, and also because Py3 doesn't have os.tempnam in the misguided pursuit of "security" if len(dbjson) > 0: os.rename(self.questionfile, self.questionfile+".auto.bak") - tmpfn = os.tempnam('.', 'trivia') try: - f = open(tmpfn, "w") + # TODO replace both of these with tempfile.NamedTemporaryFile(delete=False, dir=os.path.dirname(self.questionfile), prefix='trivia') & f.name : + if sys.version_info.major < 3: + tmpfn = os.tempnam('.', 'trivia') + f = open(tmpfn, "w") + else: + fd, tmpfn = tempfile.mkstemp(dir='.', prefix='trivia') + f = open(fd, "w") f.write(dbjson) f.close() os.rename(tmpfn, self.questionfile) @@ -140,7 +154,9 @@ class TriviaState(object): os.unlink(tmpfn) except OSError: # temp file is already gone pass - raise # we may be better off just swallowing exceptions? + except UnboundLocalError: + pass + raise return False def getchan(self): @@ -154,16 +170,18 @@ class TriviaState(object): if self.hintstr is None or self.revealpossibilities is None or self.reveal is None: oldhintstr = "" self.hintstr = list(re.sub(r'[a-zA-Z0-9]', '*', answer)) - self.revealpossibilities = range(''.join(self.hintstr).count('*')) + self.revealpossibilities = list(range(''.join(self.hintstr).count('*'))) self.reveal = int(round(''.join(self.hintstr).count('*') * (7/24.0))) else: oldhintstr = ''.join(self.hintstr) - for i in range(self.reveal): - revealcount = random.choice(self.revealpossibilities) - revealloc = findnth(''.join(self.hintstr), '*', revealcount) - self.revealpossibilities.remove(revealcount) - self.hintstr[revealloc] = answer[revealloc] + try: + for i in range(self.reveal): + revealcount = random.choice(self.revealpossibilities) + revealloc = findnth(''.join(self.hintstr), '*', revealcount) + self.revealpossibilities.remove(revealcount) + self.hintstr[revealloc] = answer[revealloc] + except IndexError: pass # if everything is revealed, random.choice will IndexError if oldhintstr != ''.join(self.hintstr): self.getchan().fastmsg("\00304,01Here's a hint: %s" % (''.join(self.hintstr))) self.hintsgiven += 1 @@ -188,14 +206,15 @@ class TriviaState(object): except Exception as e: msg("DERP! %r" % (e)) - self.db['lastwinner'] = winner - self.db['lastwon'] = time.time() - if self.db['hofpath'] is not None and self.db['hofpath'] != '': self.writeHof() + self.db['lastwinner'] = winner + self.db['lastwon'] = time.time() + self.db['users'] = {} self.db['ranks'] = [] + self.savedb() stop() self.closeshop() @@ -218,6 +237,7 @@ class TriviaState(object): except: return 0 status = False + f = None try: f = open(self.db['hofpath'], 'rb+') for i in range(self.db['hoflines']): #skip this many lines @@ -225,7 +245,7 @@ class TriviaState(object): insertpos = f.tell() fcontents = f.read() f.seek(insertpos) - f.write((self.db['hofformat']+"\n") % { + new_line = self.db['hofformat'] % { 'date': time.strftime("%F", time.gmtime()), 'duration': str(datetime.timedelta(seconds=time.time()-self.db['lastwon'])), 'targetscore': self.db['target'], @@ -235,13 +255,18 @@ class TriviaState(object): 'secondscore': pts(1), 'thirdperson': person(2), 'thirdscore': pts(2), - }) + } + f.write(new_line.encode() + b"\n") f.write(fcontents) status = True except Exception as e: + print(repr(e)) + print(type(e)) + print(e.message) status = False finally: - f.close() + if f is not None: + f.close() return status def endPointVote(self): @@ -261,9 +286,12 @@ class TriviaState(object): self.lastqid = self.curqid self.curq = None self.curqid = None + self.lastqtime = time.time() if self.gameover == True: return self.doGameOver() if qskipped: + self.streak = 0 + self.streak_holder = None self.getchan().fastmsg("\00304Fail! The correct answer was: %s" % (self.hintanswer)) self.missedquestions += 1 else: @@ -303,6 +331,7 @@ class TriviaState(object): elif self.nextqid is not None: nextqid = self.nextqid nextq = self.questions[nextqid] + if len(nextq) > 2: nextq[2] = 0 # Unset the time it was last asked. self.nextqid = None else: nextqid = random.randrange(0, len(self.questions)) @@ -319,7 +348,7 @@ class TriviaState(object): else: nextq.append(time.time()) - if isinstance(nextq[1], basestring): + if isinstance(nextq[1], stringbase): nextq[1] = nextq[1].lower() else: nextq[1] = [s.lower() for s in nextq[1]] @@ -330,19 +359,20 @@ class TriviaState(object): qtext += " " for qword in qary: spacer = random.choice( - range(0x61,0x7A) + ([0x20]*4) + list(range(0x61,0x7A)) + ([0x20]*4) ) qtext += "\00304,01"+qword+"\00301,01"+chr(spacer) #a-z if not self.getbot().fastmsg(self.chan, qtext): #if message is too long: if not self.getbot().fastmsg(self.chan, "\00312,01Next up: " + ("(%5d)" % (random.randint(0,99999))) + "\00304,01" + nextq[0]): - if nextqid is None: nextqid = "manual" - self.getbot().slowmsg(self.chan, "(Unable to ask question #%s: line too long)" % (nextqid)) - return self._nextquestion(iteration) #retry; don't increment the iteration + if not self.getbot().fastmsg(self.chan, "Next up: " + nextq[0]): + if nextqid is None: nextqid = "manual" + self.getbot().slowmsg(self.chan, "(Unable to ask question #%s: line too long)" % (nextqid)) + return self._nextquestion(iteration) #retry; don't increment the iteration self.curq = nextq self.curqid = nextqid - if isinstance(self.curq[1], basestring): self.hintanswer = self.curq[1] + if isinstance(self.curq[1], stringbase): self.hintanswer = self.curq[1] else: self.hintanswer = random.choice(self.curq[1]) self.steptimer = MyTimer(self.db['hinttimer'], self.nexthint, args=[1]) @@ -351,7 +381,7 @@ class TriviaState(object): def checkanswer(self, answer): if self.curq is None: return False - elif isinstance(self.curq[1], basestring): + elif isinstance(self.curq[1], stringbase): return answer.lower() == self.curq[1] else: # assume it's a list or something. return answer.lower() in self.curq[1] @@ -421,12 +451,27 @@ def trivia_checkanswer(bot, user, chan, *args): line = ' '.join([str(arg) for arg in 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))) + + if state.streak_holder == user: + state.streak += 1 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))) + if state.streak >= 3: + bot.fastmsg(chan, "\00312%s\003 broke \00304%s\003's streak of \00307%d\003!" % (user, state.streak_holder, state.streak)) + state.streak_holder = user + state.streak = 1 + + response = "\00312%s\003 got it in %d seconds! The answer was \00312%s\003" % (user, time.time()-state.lastqtime, line) + if state.hintanswer.lower() != line.lower(): + response += " (hinted answer: %s)" % (state.hintanswer) + response += ". New score: %d. Rank: %d. Target: %s %s" % (state.addpoint(user), state.rank(user), state.targetuser(user), state.targetpoints(user)) + bot.fastmsg(chan, response) + + if state.streak >= 3: + bot.msg(chan, "\00312%s\003 is on a streak! \00307%d\003 answers correct in a row!" % (user, state.streak)) + 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, wantchan=True) @@ -477,7 +522,7 @@ def setnextid(bot, user, chan, realtarget, *args): bot.msg(user, "Error: no such QID.") return state.nextqid = qid - bot.msg(user, "Done. Next question is %d: %s" % (qid, state.questions[qid][0])) + bot.msg(user, "Done. Next question is %d: %s" % (qid, state.questions[qid][0]), truncate=True) @lib.hook(glevel=lib.STAFF, needchan=False) @lib.help("*", "sets next question to one not in database") @@ -498,14 +543,14 @@ def setnext(bot, user, chan, realtarget, *args): def skip(bot, user, chan, realtarget, *args): state.nextquestion(qskipped=True, skipwait=True) -@lib.hook(needchan=False, wantchan=True) +@lib.hook(('start','trivia'), needchan=False, wantchan=True) @lib.help(None, "starts the trivia game") def start(bot, user, chan, realtarget, *args): if chan is not None: replyto = chan else: replyto = user if chan is not None and chan.name != state.db['chan']: - bot.msg(replyto, "That command isn't valid here.") + bot.msg(replyto, "That command is only valid in %s" % (state.db['chan'])) return if state.curq is None and state.pointvote is None and state.nextquestiontimer is None: @@ -673,7 +718,8 @@ def questionpause(bot, user, chan, realtarget, *args): bot.msg(user, "Failed to set questionpause.") @lib.hook(glevel=1, needchan=False) -@lib.help("", "finds a qid given a complete question") +@lib.help("[@category] ", "finds a question (qid) given a (partial) question") +@lib.argsGE(1) def findq(bot, user, chan, realtarget, *args): args = list(args) if args[0].startswith("@"): @@ -682,21 +728,12 @@ def findq(bot, user, chan, realtarget, *args): else: questions = state.questions - 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(questions)) if 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.") + pattern = re.escape(' '.join(args)) + bot.msg(user, _findq(questions, pattern)) @lib.hook(glevel=1, needchan=False) -@lib.help("[@] ", "finds a qid given a regex or partial question") +@lib.help("[@] ", "finds a question (qid) given a regex") +@lib.argsGE(1) def findqre(bot, user, chan, realtarget, *args): args = list(args) if args[0].startswith("@"): @@ -704,21 +741,20 @@ def findqre(bot, user, chan, realtarget, *args): questions = state.db['questions'][cat] else: questions = state.questions + pattern = ' '.join(args) + bot.msg(user, _findq(questions, pattern)) - if len(args) == 0: - bot.msg(user, "You need to specify a search string.") - return - - searcher = re.compile(' '.join(args), re.IGNORECASE) +def _findq(questions, pattern): + searcher = re.compile(pattern, re.IGNORECASE) matches = [str(i) for i in range(len(questions)) if searcher.search(questions[i][0]) is not None] if len(matches) > 25: - bot.msg(user, "Too many matches! (>25)") + return "Too many matches! (>25)" elif len(matches) > 1: - bot.msg(user, "Multiple matches: %s" % (', '.join(matches))) + return "Multiple matches: %s" % (', '.join(matches)) elif len(matches) == 1: - bot.msg(user, "One match: %s" % (matches[0])) + return "One match: %s" % (matches[0]) else: - bot.msg(user, "No match.") + return "No match." @lib.hook(glevel=lib.STAFF, needchan=False) @lib.help("[@] ", "displays the q*a for a qid", "category defaults to current") @@ -740,7 +776,7 @@ def showq(bot, user, chan, realtarget, *args): except: bot.msg(user, "ID not valid.") return - bot.msg(user, "%s: %s*%s" % (qid, q[0], q[1])) + bot.msg(user, "%s: %s*%s" % (qid, q[0], q[1]), True) @lib.hook(('delq', 'deleteq'), glevel=lib.STAFF, needchan=False) @lib.help("[@] ", "removes a question from the database") @@ -755,8 +791,8 @@ def delq(bot, user, chan, realtarget, *args): try: backup = questions[int(args[0])] del questions[int(args[0])] - bot.msg(user, "Deleted %s*%s" % (backup[0], backup[1])) - except: + bot.msg(user, "Deleted %s*%s" % (backup[0], backup[1]), True) + except Exception as e: bot.msg(user, "Couldn't delete that question. %r" % (e)) @lib.hook(glevel=lib.STAFF, needchan=False)