Test Initializing

wrdler/ui.py

@@ -117,116 +117,117 @@ def _build_letter_map(puzzle) -> dict[CoordLike, str]:
 def _init_session() -> None:
     if "initialized" in st.session_state and st.session_state.initialized:
         return
+    spinner_placeholder = st.empty()
+    with CustomSpinner(spinner_placeholder, "Initializing session..."):
+        # --- Load most recent settings from settings/settings.json ---
+
+        latest_settings = load_latest_settings()
+
+        if latest_settings:
+            # Apply all keys from settings file into session_state before any defaults
+            for key, value in latest_settings.items():
+                # Avoid clobbering an already-initialized puzzle or game progress
+                if key in {"puzzle", "revealed", "guessed", "score", "points_by_word"}:
+                    continue
+                st.session_state[key] = value
+            # --- Ensure enable_sound_effects is always set from loaded settings ---
+            if "enable_sound_effects" in latest_settings:
+                st.session_state.enable_sound_effects = latest_settings["enable_sound_effects"]
+
+        # --- Preserve music settings ---
+
+        # Check if we're loading a shared game
+        shared_settings = st.session_state.get("shared_game_settings")
+
+        # Apply challenge-specific settings before initializing defaults
+        # This ensures show_incorrect_guesses, enable_free_letters, game_title are set from challenge
+        if shared_settings:
+            _apply_challenge_settings(shared_settings)
+
+        # Ensure a default selection exists before creating the puzzle
+        files = get_wordlist_files()
+        if "selected_wordlist" not in st.session_state and files:
+            st.session_state.selected_wordlist = "classic.txt"
+        if "game_mode" not in st.session_state:
+            st.session_state.game_mode = "classic"
+
+        # Generate puzzle with shared game settings if available
+        if shared_settings:
+            # Each user gets different random words from the same wordlist source
+            wordlist_source = shared_settings.get("wordlist_source", "classic.txt")
+            spacer = shared_settings["puzzle_options"].get("spacer", 1)
+            game_mode = shared_settings.get("game_mode", "classic")
+
+            # Override selected wordlist to match challenge
+            st.session_state.selected_wordlist = wordlist_source
+
+            # Generate puzzle with random words from the challenge's wordlist (Wrdler:8×6 grid)
+            words = load_word_list(wordlist_source)
+            puzzle = generate_puzzle(
+                grid_rows=6,
+                grid_cols=8,
+                words_by_len=words,
+                spacer=spacer
+            )
+            st.session_state.game_mode = game_mode
+            st.session_state.spacer = spacer
 
-    # --- Load most recent settings from settings/settings.json ---
-
-    latest_settings = load_latest_settings()
-
-    if latest_settings:
-        # Apply all keys from settings file into session_state before any defaults
-        for key, value in latest_settings.items():
-            # Avoid clobbering an already-initialized puzzle or game progress
-            if key in {"puzzle", "revealed", "guessed", "score", "points_by_word"}:
-                continue
-            st.session_state[key] = value
-        # --- Ensure enable_sound_effects is always set from loaded settings ---
-        if "enable_sound_effects" in latest_settings:
-            st.session_state.enable_sound_effects = latest_settings["enable_sound_effects"]
-
-    # --- Preserve music settings ---
-
-    # Check if we're loading a shared game
-    shared_settings = st.session_state.get("shared_game_settings")
-
-    # Apply challenge-specific settings before initializing defaults
-    # This ensures show_incorrect_guesses, enable_free_letters, game_title are set from challenge
-    if shared_settings:
-        _apply_challenge_settings(shared_settings)
-
-    # Ensure a default selection exists before creating the puzzle
-    files = get_wordlist_files()
-    if "selected_wordlist" not in st.session_state and files:
-        st.session_state.selected_wordlist = "classic.txt"
-    if "game_mode" not in st.session_state:
-        st.session_state.game_mode = "classic"
-
-    # Generate puzzle with shared game settings if available
-    if shared_settings:
-        # Each user gets different random words from the same wordlist source
-        wordlist_source = shared_settings.get("wordlist_source", "classic.txt")
-        spacer = shared_settings["puzzle_options"].get("spacer", 1)
-        game_mode = shared_settings.get("game_mode", "classic")
-
-        # Override selected wordlist to match challenge
-        st.session_state.selected_wordlist = wordlist_source
-
-        # Generate puzzle with random words from the challenge's wordlist (Wrdler:8×6 grid)
-        words = load_word_list(wordlist_source)
-        puzzle = generate_puzzle(
-            grid_rows=6,
-            grid_cols=8,
-            words_by_len=words,
-            spacer=spacer
-        )
-        st.session_state.game_mode = game_mode
-        st.session_state.spacer = spacer
-
-        # Users will see leaderboard showing all players' results
-        # Each player has their own uid and word_list in the users array
-    else:
-        # Normal game generation (Wrdler: 8 columns × 6 rows)
-        # Use unified loader that handles both AI and file modes
-        words = load_word_list_or_ai(
-            use_ai=st.session_state.get("use_ai_wordlist", False),
-            topic=st.session_state.get("ai_topic", "English"),
-            selected_file=st.session_state.get("selected_wordlist")
-        )
-        puzzle = generate_puzzle(grid_rows=6, grid_cols=8, words_by_len=words)
-
-    st.session_state.puzzle = puzzle
-    st.session_state.grid_rows = 6  # Wrdler uses 6 rows
-    st.session_state.grid_cols = 8  # Wrdler uses 8 columns
-    st.session_state.revealed = set()
-    st.session_state.guessed = set()
-    st.session_state.score = 0
-    # Update welcome message based on free letters setting
-    if st.session_state.get("enable_free_letters", False):
-        st.session_state.last_action = "Welcome to Wrdler! Choose 2 free letters to start. Guess the words on each line!"
-    else:
-        st.session_state.last_action = "Welcome to Wrdler! Reveal cells and guess the words on each line!"
-    st.session_state.can_guess = False
-    st.session_state.points_by_word = {}
-    st.session_state.letter_map = build_letter_map(puzzle)
-    st.session_state.initialized = True
-    st.session_state.start_time = None  # Timer starts on first action (grid click or free letter)
-    st.session_state.end_time = None
-    # Ensure game_mode is set
-    if "game_mode" not in st.session_state:
-        st.session_state.game_mode = "classic"
-    # Initialize incorrect guesses tracking
-    if "incorrect_guesses" not in st.session_state:
-        st.session_state.incorrect_guesses = []
-    # Initialize show_incorrect_guesses to True by default
-    if "show_incorrect_guesses" not in st.session_state:
-        st.session_state.show_incorrect_guesses = True
-
-    # NEW: Initialize Show Challenge Share Links (default ON)
-    if "show_challenge_share_links" not in st.session_state:
-        st.session_state.show_challenge_share_links = True
+            # Users will see leaderboard showing all players' results
+            # Each player has their own uid and word_list in the users array
+        else:
+            # Normal game generation (Wrdler: 8 columns × 6 rows)
+            # Use unified loader that handles both AI and file modes
+            words = load_word_list_or_ai(
+                use_ai=st.session_state.get("use_ai_wordlist", False),
+                topic=st.session_state.get("ai_topic", "English"),
+                selected_file=st.session_state.get("selected_wordlist")
+            )
+            puzzle = generate_puzzle(grid_rows=6, grid_cols=8, words_by_len=words)
+
+        st.session_state.puzzle = puzzle
+        st.session_state.grid_rows = 6  # Wrdler uses 6 rows
+        st.session_state.grid_cols = 8  # Wrdler uses 8 columns
+        st.session_state.revealed = set()
+        st.session_state.guessed = set()
+        st.session_state.score = 0
+        # Update welcome message based on free letters setting
+        if st.session_state.get("enable_free_letters", False):
+            st.session_state.last_action = "Welcome to Wrdler! Choose 2 free letters to start. Guess the words on each line!"
+        else:
+            st.session_state.last_action = "Welcome to Wrdler! Reveal cells and guess the words on each line!"
+        st.session_state.can_guess = False
+        st.session_state.points_by_word = {}
+        st.session_state.letter_map = build_letter_map(puzzle)
+        st.session_state.initialized = True
+        st.session_state.start_time = None  # Timer starts on first action (grid click or free letter)
+        st.session_state.end_time = None
+        # Ensure game_mode is set
+        if "game_mode" not in st.session_state:
+            st.session_state.game_mode = "classic"
+        # Initialize incorrect guesses tracking
+        if "incorrect_guesses" not in st.session_state:
+            st.session_state.incorrect_guesses = []
+        # Initialize show_incorrect_guesses to True by default
+        if "show_incorrect_guesses" not in st.session_state:
+            st.session_state.show_incorrect_guesses = True
+
+        # NEW: Initialize Show Challenge Share Links (default ON)
+        if "show_challenge_share_links" not in st.session_state:
+            st.session_state.show_challenge_share_links = True
     
-    # NEW: Initialize free letters tracking
-    if "free_letters" not in st.session_state:
-        st.session_state.free_letters = set()
-    if "free_letters_used" not in st.session_state:
-        st.session_state.free_letters_used = 0
-    if "enable_free_letters" not in st.session_state:
-        st.session_state.enable_free_letters = False
-    if "show_grid_ticks" not in st.session_state:
-        st.session_state.show_grid_ticks = False        
-
-    # --- Add enable sound effects ---
-    if "enable_sound_effects" not in st.session_state:
-        st.session_state.enable_sound_effects = False
+        # NEW: Initialize free letters tracking
+        if "free_letters" not in st.session_state:
+            st.session_state.free_letters = set()
+        if "free_letters_used" not in st.session_state:
+            st.session_state.free_letters_used = 0
+        if "enable_free_letters" not in st.session_state:
+            st.session_state.enable_free_letters = False
+        if "show_grid_ticks" not in st.session_state:
+            st.session_state.show_grid_ticks = False        
+
+        # --- Add enable sound effects ---
+        if "enable_sound_effects" not in st.session_state:
+            st.session_state.enable_sound_effects = False
    
 
 def _new_game() -> None: