Update app.py

app.py

@@ -921,6 +921,10 @@ def create_game(host=None, topics=[], num_questions=5, auto_close=True, ai_topic
 # PLAY PAGE
 # -------------------------
 def play_page():
+    import time, json
+    import streamlit as st
+
+    # ---------------- BASIC CHECKS ----------------
     gid = st.session_state.get("active_game_id")
     uname = st.session_state.get("username")
 
@@ -928,7 +932,7 @@ def play_page():
         st.error("No active game or username found. Please join or create a game first.")
         return
 
-    # ---------------- Load game ----------------
+    # ---------------- LOAD GAME ----------------
     games = unified_get("games") or {}
     game = games.get(gid)
 
@@ -942,36 +946,51 @@ def play_page():
 
     questions = game.get("questions", [])
     if not questions:
-        st.info("No questions loaded for this game.")
+        st.info("No questions available.")
         return
 
-    # ---------------- Init session state ----------------
-    if "answers" not in st.session_state:
-        st.session_state.answers = [""] * len(questions)
-    if "answer_times" not in st.session_state:
-        st.session_state.answer_times = [0] * len(questions)
-    if "current_index" not in st.session_state:
+    # ---------------- INIT SESSION STATE (SAFE) ----------------
+    n = len(questions)
+
+    if "answers" not in st.session_state or not isinstance(st.session_state.answers, list):
+        st.session_state.answers = [""] * n
+
+    if "answer_times" not in st.session_state or not isinstance(st.session_state.answer_times, list):
+        st.session_state.answer_times = [0] * n
+
+    if "current_index" not in st.session_state or not isinstance(st.session_state.current_index, int):
         st.session_state.current_index = 0
+
     if "question_started_at" not in st.session_state:
         st.session_state.question_started_at = time.time()
 
     idx = st.session_state.current_index
 
-    # ---------------- All done ----------------
-    if idx >= len(questions):
-        st.success("All done — submit your answers!")
+    # ---------------- FINISHED ----------------
+    if idx >= n:
+        st.success("All questions completed.")
         return
 
-    # ---------------- Question UI ----------------
+    # ---------------- QUESTION UI ----------------
     q = questions[idx]
-    st.subheader(f"Question {idx + 1}/{len(questions)}")
+    st.subheader(f"Question {idx + 1} / {n}")
     st.write(q["question"])
 
+    # ---------------- SAFE TIMER (ZERO CRASH) ----------------
+    now = time.time()
     start_time = st.session_state.get("question_started_at")
-    elapsed = int(time.time() - start_time)
+
+    if start_time is None:
+        start_time = now
+        st.session_state.question_started_at = now
+
+    elapsed = int(now - start_time)
     time_limit = 15
-    st.markdown(f"**⏱ Time left:** {max(0, time_limit - elapsed)} seconds")
+    remaining = max(0, time_limit - elapsed)
+
+    st.markdown(f"**⏱ Time left:** {remaining} seconds")
 
+    # ---------------- ANSWER ----------------
     choice = st.radio(
         "Choose an answer:",
         q["options"],
@@ -984,28 +1003,28 @@ def play_page():
     with col1:
         if st.button("Next", key=f"next_{gid}_{idx}"):
             st.session_state.answers[idx] = choice
-            st.session_state.answer_times[idx] = time.time() - start_time
+            st.session_state.answer_times[idx] = elapsed
             st.session_state.current_index += 1
             st.session_state.question_started_at = time.time()
             st.rerun()
 
     # ---------------- SUBMIT ----------------
     with col2:
-        if idx == len(questions) - 1:
+        if idx == n - 1:
             if st.button("Submit All Answers", key=f"submit_{gid}_{idx}"):
 
                 # Save last answer
                 st.session_state.answers[idx] = choice
-                st.session_state.answer_times[idx] = time.time() - start_time
+                st.session_state.answer_times[idx] = elapsed
 
                 answers = st.session_state.answers
                 times = st.session_state.answer_times
 
                 # Compute score
                 score, flags = compute_score(questions, answers, times)
-                percentage = int(score / (len(questions) * 15) * 100)
+                percentage = int(score / (n * time_limit) * 100)
 
-                # ---------------- Update players ----------------
+                # ---------------- UPDATE PLAYERS ----------------
                 players = unified_get("players") or {}
                 players.setdefault(gid, {})
                 players[gid][uname] = {
@@ -1018,7 +1037,7 @@ def play_page():
                 }
                 unified_set("players", players)
 
-                # ---------------- Save leaderboard ----------------
+                # ---------------- SAVE LEADERBOARD ----------------
                 row = {
                     "name": uname,
                     "score": score,
@@ -1026,7 +1045,7 @@ def play_page():
                     "topics": ",".join(game.get("topics", [])),
                     "timestamp": now_iso(),
                     "avatar": st.session_state.get("avatar", "🎮"),
-                    "questions": len(questions),
+                    "questions": n,
                     "answers": json.dumps(answers),
                     "correct_flags": json.dumps(flags),
                 }
@@ -1034,19 +1053,22 @@ def play_page():
                 unified_push_leaderboard(row)
                 save_score_to_csv(row)
 
-                # ---------------- Auto close game ----------------
+                # ---------------- AUTO CLOSE GAME ----------------
                 if game.get("auto_close", True):
                     games[gid]["closed"] = True
                     games[gid]["closed_at"] = now_iso()
                     unified_set("games", games)
 
-                st.success(f"🎉 Submitted! Score: {score} / {len(questions)*15} ({percentage}%)")
+                st.success(f"🎉 Submitted! Score: {score} / {n*time_limit} ({percentage}%)")
                 st.balloons()
 
-                # Reset state
-                st.session_state.clear()
+                # ---------------- SAFE RESET (NO CLEAR) ----------------
+                for k in ["answers", "answer_times", "current_index", "question_started_at"]:
+                    st.session_state.pop(k, None)
+
                 st.rerun()
 
+
 # Join game
 def join_game_page():
     st.header("Join Game")