update team

[erebus.git] / modules / trivia.py

diff --git a/modules/trivia.py b/modules/trivia.py
index 8abc9ff7230467d09e15a48575424786760ab7b9..cf67a2a3ca907afad1c226d054b3c2770909828b 100644 (file)
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -137,6 +137,7 @@ class TriviaState(object):
                        if len(dbjson) > 0:
                                os.rename(self.questionfile, self.questionfile+".auto.bak")
                                try:
+                                       # 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")
@@ -169,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)
@@ -244,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'],
@@ -254,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:
@@ -326,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))
@@ -358,9 +364,10 @@ class TriviaState(object):
                        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
@@ -711,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] <full question>", "finds a qid given a complete question")
+@lib.help("[@category] <question>", "finds a question (qid) given a (partial) question")
 @lib.argsGE(1)
 def findq(bot, user, chan, realtarget, *args):
        args = list(args)
@@ -721,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))
+       bot.msg(user, _findq(questions, pattern))
 
 @lib.hook(glevel=1, needchan=False)
-@lib.help("[@<category>] <regex>", "finds a qid given a regex or partial question")
+@lib.help("[@<category>] <regex>", "finds a question (qid) given a regex")
 @lib.argsGE(1)
 def findqre(bot, user, chan, realtarget, *args):
        args = list(args)
@@ -744,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("[@<category>] <qid>", "displays the q*a for a qid", "category defaults to current")