X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/9138aa030f94fe3c9b217370e7139c74d11dfdc9..cf400e0917f9b214cd7642e410ac0a13a9a8c726:/modules/trivia.py diff --git a/modules/trivia.py b/modules/trivia.py index cb77be7..b716a59 100644 --- a/modules/trivia.py +++ b/modules/trivia.py @@ -1,14 +1,17 @@ # Erebus IRC bot - Author: Erebus Team +# vim: fileencoding=utf-8 # trivia module # This file is released into the public domain; see http://unlicense.org/ +from __future__ import print_function + # module info modinfo = { 'author': 'Erebus Team', 'license': 'public domain', - 'compatible': [1,2], - 'depends': ['userinfo'], - 'softdeps': ['help'], + 'compatible': [0], + 'depends': [], + 'softdeps': ['help','userinfo'], } # preamble @@ -28,7 +31,16 @@ def modstop(*args, **kwargs): return lib.modstop(*args, **kwargs) # module code -import json, random, threading, re, time, datetime, os +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: import twitter @@ -56,15 +68,20 @@ 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(threading._Timer): +class MyTimer(timerbase): def __init__(self, *args, **kwargs): - threading._Timer.__init__(self, *args, **kwargs) + timerbase.__init__(self, *args, **kwargs) self.daemon = True 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) @@ -76,6 +93,7 @@ class TriviaState(object): self.chan = self.db['chan'] self.curq = None self.nextq = None + self.nextqid = None self.nextquestiontimer = None self.steptimer = None self.hintstr = None @@ -91,16 +109,16 @@ class TriviaState(object): self.db['lastwon'] = time.time() if pointvote: - self.getchan().msg("Vote for the next round target points! Options: %s. Vote using !vote " % (', '.join([str(x) for x in self.db['targetoptions']]))) - self.getchan().msg("You have %s seconds." % (self.db['votetimer'])) + self.getchan().fastmsg("Vote for the next round target points! Options: %s. Vote using !vote " % (', '.join([str(x) for x in self.db['targetoptions']]))) + self.getchan().fastmsg("You have %s seconds." % (self.db['votetimer'])) self.voteamounts = dict([(x, 0) for x in self.db['targetoptions']]) # make a dict {pointsoptionA: 0, pointsoptionB: 0, ...} self.pointvote = MyTimer(self.db['votetimer'], self.endPointVote) self.pointvote.start() else: self.pointvote = None - def __del__(self): - self.closeshop() +# def __del__(self): +# self.closeshop() def closeshop(self): try: self.steptimer.cancel() @@ -115,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) @@ -130,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): @@ -144,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 @@ -178,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() @@ -208,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 @@ -215,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'], @@ -225,18 +255,23 @@ 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): 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])) @@ -251,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: @@ -290,22 +328,27 @@ class TriviaState(object): nextqid = None nextq = self.nextq self.nextq = None + 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)) nextq = self.questions[nextqid] - if nextq[0][0] == "!": + if nextq[0].startswith("!"): nextqid = None nextq = specialQuestion(nextq) - if len(nextq) > 2 and nextq[2] - time.time() < 7*24*60*60 and iteration < 10: + if len(nextq) > 2 and time.time() - nextq[2] < 7*24*60*60 and iteration < 10: return self._nextquestion(iteration=iteration+1) #short-circuit to pick another question if len(nextq) > 2: nextq[2] = time.time() 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]] @@ -316,15 +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 - self.getbot().fastmsg(self.chan, qtext) + 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 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]) @@ -333,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] @@ -403,18 +451,33 @@ 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) +@lib.hook(glevel=1, needchan=False, wantchan=True) @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 + if chan is not None: replyto = chan else: replyto = user if state.savedb(): @@ -422,10 +485,10 @@ def save(bot, user, chan, realtarget, *args): else: bot.msg(replyto, "Save failed!") -@lib.hook(needchan=False) +@lib.hook(needchan=False, wantchan=True) @lib.help("[]", "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 + if chan is not None: eplyto = chan else: replyto = user if len(args) != 0: who = args[0] @@ -452,21 +515,21 @@ def give(bot, user, chan, realtarget, *args): def setnextid(bot, user, chan, realtarget, *args): try: qid = int(args[0]) - state.nextq = state.questions[qid] - if user.glevel >= lib.STAFF: - respstr = "Done. Next question is: %s" % (state.nextq[0]) - else: - respstr = "Done." - bot.msg(user, respstr) - except Exception as e: - bot.msg(user, "Error: %s" % (e)) + except ValueError: + bot.msg(user, "Error: QID must be a number.") + return + if qid >= len(state.questions): + 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]), truncate=True) @lib.hook(glevel=lib.STAFF, needchan=False) @lib.help("*", "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]) - linepieces = line.split('*') + linepieces = line.split('*', 1) if len(linepieces) < 2: bot.msg(user, "Error: need *") return @@ -480,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) +@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 and realtarget == chan.name: replyto = chan + 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: @@ -512,12 +575,12 @@ def stop(): try: state.steptimer.cancel() except Exception as e: - print "!!! steptimer.cancel(): %s %r" % (e,e) + print("!!! steptimer.cancel(): %s %r" % (e,e)) state.steptimer = None try: state.nextquestiontimer.cancel() except Exception as e: - print "!!! nextquestiontimer.cancel(): %s %r" % (e,e) + print("!!! nextquestiontimer.cancel(): %s %r" % (e,e)) state.nextquestiontimer = None return True @@ -568,10 +631,10 @@ def delbadq(bot, user, chan, realtarget, *args): except: bot.msg(user, "Failed!") -@lib.hook(needchan=False) +@lib.hook(needchan=False, wantchan=True) @lib.help("[]", "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 + if chan is not None: replyto = chan else: replyto = user if len(args) != 0: who = args[0] @@ -589,7 +652,7 @@ def top10(bot, user, chan, realtarget, *args): if max > 10: max = 10 replylist = ', '.join(["%s (%s) %s" % (person(x), country(x), pts(x)) for x in range(max)]) - bot.msg(state.db['chan'], "Top 10: %s" % (replylist)) + bot.msg(state.db['chan'], "Game is to %s! Top 10: %s" % (state.db['target'], replylist)) @lib.hook(glevel=lib.ADMIN, needchan=False) @lib.help("", "changes the target score for this round") @@ -603,7 +666,7 @@ def settarget(bot, user, chan, realtarget, *args): state.pointvote = None bot.msg(state.db['chan'], "Vote has been cancelled!") except Exception as e: - print e + print(e) bot.msg(user, "Failed to set target.") @lib.hook(needchan=False) @@ -655,58 +718,63 @@ 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][0] == "@": + if args[0].startswith("@"): cat = args.pop(0)[1:].lower() questions = state.db['questions'][cat] 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) - if args[0][0] == "@": + 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) - 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") def showq(bot, user, chan, realtarget, *args): args = list(args) - if args[0][0] == "@": + if args[0].startswith("@"): cat = args.pop(0)[1:].lower() questions = state.db['questions'][cat] else: @@ -722,13 +790,13 @@ 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") def delq(bot, user, chan, realtarget, *args): args = list(args) - if args[0][0] == "@": + if args[0].startswith("@"): cat = args.pop(0)[1:].lower() questions = state.db['questions'][cat] else: @@ -737,22 +805,22 @@ 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) @lib.help("[@] *", "adds a question") def addq(bot, user, chan, realtarget, *args): args = list(args) - if args[0][0] == "@": + if args[0].startswith("@"): cat = args.pop(0)[1:].lower() questions = state.db['questions'][cat] else: questions = state.questions line = ' '.join([str(arg) for arg in args]) - linepieces = line.split('*') + linepieces = line.split('*', 1) if len(linepieces) < 2: bot.msg(user, "Error: need *") return @@ -761,6 +829,11 @@ def addq(bot, user, chan, realtarget, *args): questions.append([question, answer]) bot.msg(user, "Done. Question is #%s" % (len(questions)-1)) +@lib.hook(needchan=False) +@lib.help(None, "show current category") +def showcat(bot, user, chan, realtarget, *args): + bot.msg(user, "Current category: %s" % (state.db['category'])) + @lib.hook(glevel=1, needchan=False) @lib.help("", "change category") def setcat(bot, user, chan, realtarget, *args): @@ -773,9 +846,9 @@ def setcat(bot, user, chan, realtarget, *args): bot.msg(user, "That category doesn't exist.") @lib.hook(needchan=False) -@lib.help(None, "list categories") +@lib.help(None, "list categories", "the current category will be marked with a *") def listcats(bot, user, chan, realtarget, *args): - cats = ["%s (%d)" % (c, len(state.db['questions'][c])) for c in state.db['questions'].keys()] + cats = ["%s%s (%d)" % ("*" if c == state.db['category'] else "", c, len(state.db['questions'][c])) for c in state.db['questions'].keys()] bot.msg(user, "Categories: %s" % (', '.join(cats))) @lib.hook(glevel=lib.STAFF, needchan=False) @@ -830,12 +903,8 @@ def triviahelp(bot, user, chan, realtarget, *args): bot.slowmsg(user, "HINTNUM (ADMIN)") bot.slowmsg(user, "QUESTIONPAUSE (ADMIN)") -@lib.hooknum(417) -def num_417(bot, textline): -# bot.fastmsg(state.db['chan'], "Whoops, it looks like that question didn't quite go through! (E:417). Let's try another...") - state.nextquestion(qskipped=False, skipwait=True) - -@lib.hooknum(332) +@lib.hooknum(332) # topic is... +@lib.hooknum(331) # no topic set def num_TOPIC(bot, textline): pieces = textline.split(None, 4) chan = pieces[3] @@ -865,9 +934,10 @@ def num_TOPIC(bot, textline): 'lastwinner': state.db['lastwinner'], 'lastwon': time.strftime("%b %d", time.gmtime(state.db['lastwon'])), 'target': state.db['target'], + 'category': state.db['category'], } if gottopic != formatted: - state.getbot().conn.send("TOPIC %s :%s" % (state.db['chan'], formatted)) + state.getbot().conn.send(bot.parent.cfg.get('trivia', 'topiccommand', default="TOPIC %(chan)s :%(topic)s") % {'chan': state.db['chan'], 'topic': formatted}) def specialQuestion(oldq): @@ -878,16 +948,61 @@ def specialQuestion(oldq): newq[0] = "What month is it currently (in UTC)?" newq[1] = time.strftime("%B", time.gmtime()).lower() elif qtype == "!MATH+": - randnum1 = random.randrange(0, 11) - randnum2 = random.randrange(0, 11) + try: + maxnum = int(oldq[1]) + except ValueError: + maxnum = 10 + randnum1 = random.randrange(0, maxnum+1) + randnum2 = random.randrange(0, maxnum+1) newq[0] = "What is %d + %d?" % (randnum1, randnum2) newq[1] = spellout(randnum1+randnum2) + elif qtype == "!ALGEBRA+": + try: + num1, num2 = [int(i) for i in oldq[1].split('!')] + except ValueError: + num1, num2 = 10, 10 + randnum1 = random.randrange(0, num1+1) + randnum2 = random.randrange(randnum1, num2+1) + newq[0] = "What is x? %d = %d + x" % (randnum2, randnum1) + newq[1] = spellout(randnum2-randnum1) else: pass #default to not modifying return newq def spellout(num): - return [ - "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", - "nine", "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen", - "sixteen", "seventeen", "eighteen", "nineteen", "twenty" - ][num] + ones = ['', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine'] + teens = ['ten', 'eleven', 'twelve', 'thirteen', 'fourteen', 'fifteen', 'sixteen', 'seventeen', 'eighteen', 'nineteen'] + tens = ['', '', 'twenty', 'thirty', 'fourty', 'fifty', 'sixty', 'seventy', 'eighty', 'ninety'] + + if num == 0: + return 'zero' + + ihundreds = num / 100 + itens = num % 100 / 10 + iones = num % 10 + buf = [] + + if ihundreds > 0: + buf.append("%s hundred" % (ones[ihundreds])) + if itens > 1: + buf.append(tens[itens]) + if itens == 1: + buf.append(teens[iones]) + elif iones > 0: + buf.append(ones[iones]) + return ' '.join(buf) +# return [ +# "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", +# "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