Categories logic

venture/game.py

@@ -1,54 +1,61 @@
 import requests
 from random import randrange
+from collections import namedtuple
+
+
 MAX_CATEGORIES = 28100
 
+
 class Game:
     def __init__(self, code):
         self.code = code
         self.locked = True
         self.players = {}
-        self.categories = []
+        self.categories = {}
+
     def add_contestant(self, sid, signature):
         self.players[sid] = Contestant(signature)
-    def add_host(self, sid):
-        self.host = sid
-    def get_questions(self):
+
+    def load_clues(self):
         while len(self.categories) < 12:
             category_id = randrange(MAX_CATEGORIES)
-            r = requests.get('https://jservice.io/api/category?id=%d' % category_id)
+            r = requests.get(
+                'https://jservice.io/api/category?id=%d' % category_id)
             j = r.json()
             category = check_and_build_category(j)
             if category:
-                self.categories.append(category)
-        
+                name, clues = category
+                self.categories[name] = clues
+
+
 class Contestant:
     def __init__(self, signature):
         self.signature = signature
         self.points = 0
 
+
 class Category:
     def __init__(self, name):
         self.name = name
         self.questions = []
 
-class Question:
-    def __init__(self, value, question, answer):
-        self.value = value
-        self.question = question
-        self.answer = answer
+
+Clue = namedtuple('Class', ['value', 'question', 'answer'])
+
 
 def check_and_build_category(j):
     if not j or not j['title'] or not j['clues_count'] or j['clues_count'] < 5:
         return None
-    category = Category(j['title'])
-    questions = [Question(c['value'], c['question'], c['answer']) for c in j['clues']]
+    name = j['title']
+    all_clues = [Clue(c['value'], c['question'], c['answer'])
+                 for c in j['clues']]
+    clues = []
     for value in [200, 400, 600, 800, 1000]:
-        for question in questions:
-            if question.value == value:
-                category.questions.append(question)
+        for clue in all_clues:
+            if clue.value == value:
+                clues.append(clue)
                 break
-    if len(category.questions) == 5:
-        return category
+    if len(clues) == 5:
+        return name, clues
     else:
         return None
-