X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/5464fa7a1deae0ad9c661c1f3035144220ca02b8..cf400e0917f9b214cd7642e410ac0a13a9a8c726:/modules/trivia.py diff --git a/modules/trivia.py b/modules/trivia.py index c3d423b..b716a59 100644 --- a/modules/trivia.py +++ b/modules/trivia.py @@ -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: @@ -130,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) @@ -145,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): @@ -159,7 +170,7 @@ 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) @@ -234,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'], @@ -244,10 +255,14 @@ 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: if f is not None: @@ -256,7 +271,7 @@ class TriviaState(object): def endPointVote(self): self.getchan().msg("Voting has ended!") - votelist = sorted(self.voteamounts.items(), key=lambda item: item[1]) #sort into list of tuples: [(option, number_of_votes), ...] + votelist = sorted(self.voteamounts.items(), key=lambda item: (item[1], -item[0])) #sort into list of tuples: [(option, number_of_votes), ...] for i in range(len(votelist)-1): item = votelist[i] self.getchan().msg("%s place: %s (%s votes)" % (len(votelist)-i, item[0], item[1])) @@ -316,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)) @@ -332,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]] @@ -343,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]) @@ -364,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] @@ -533,7 +550,7 @@ def start(bot, user, chan, realtarget, *args): 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: @@ -701,7 +718,7 @@ def questionpause(bot, user, chan, realtarget, *args): bot.msg(user, "Failed to set questionpause.") @lib.hook(glevel=1, needchan=False) -@lib.help("[@category] ", "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) @@ -711,21 +728,11 @@ 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)) + return _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) @@ -734,21 +741,34 @@ def findqre(bot, user, chan, realtarget, *args): questions = state.db['questions'][cat] else: questions = state.questions + pattern = ' '.join(args) + return _findq(questions, pattern) - if len(args) == 0: - bot.msg(user, "You need to specify a search string.") - return +@lib.hook(glevel=1, needchan=False) +@lib.help("[@] ", "finds a question (qid) given a (partial) question or answer") +@lib.argsGE(1) +def findqa(bot, user, chan, realtarget, *args): + args = list(args) + if args[0].startswith("@"): + cat = args.pop(0)[1:].lower() + questions = state.db['questions'][cat] + else: + questions = state.questions + pattern = ' '.join(args) + return _findq(questions, pattern, True) - searcher = re.compile(' '.join(args), re.IGNORECASE) - matches = [str(i) for i in range(len(questions)) if searcher.search(questions[i][0]) is not None] +def _findq(questions, pattern, check_answers=False): + searcher = re.compile(pattern, re.IGNORECASE) + matches = [i for i in range(len(questions)) if searcher.search(questions[i][0]) is not None or (check_answers and searcher.search(questions[i][1]) 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(str(x) for x in matches)) elif len(matches) == 1: - bot.msg(user, "One match: %s" % (matches[0])) + i = matches[0] + return "One match: %s %s*%s" % (i, questions[i][0], questions[i][1]) 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") @@ -975,3 +995,14 @@ def spellout(num): # "nine", "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen", # "sixteen", "seventeen", "eighteen", "nineteen", "twenty" # ][num] + + +def topa(): + answers=__import__('collections').defaultdict(int) + for a in (x[1] for x in state.db['questions']['general']): + answers[a]+=1; + a2=[] + for a, num in answers.items(): + a2.append((a, num)) + a2.sort(key=lambda v: v[1], reverse=True) + return a2