Update app.py

app.py

@@ -11,6 +11,7 @@ import pandas as pd
 import uuid
 import math
 import time
+from datetime import datetime
 
 # Import our GameState class from gamestate.py
 from gamestate import GameState
@@ -26,6 +27,63 @@ CSV_COLUMNS = ['obj_id', 'type', 'pos_x', 'pos_y', 'pos_z', 'rot_x', 'rot_y', 'r
 os.makedirs(SAVE_DIR, exist_ok=True)
 os.makedirs(GLOBAL_SAVES_DIR, exist_ok=True)
 
+# --- Helper Functions for Global Save Management ---
+
+def load_latest_global_save():
+    """
+    Load the JSON file with the most recent timestamp from GLOBAL_SAVES_DIR.
+    Returns None if no global save exists.
+    """
+    json_files = [f for f in os.listdir(GLOBAL_SAVES_DIR) if f.endswith(".json")]
+    if not json_files:
+        return None
+    # Assuming filenames contain timestamp info, sort them in reverse order.
+    json_files.sort(reverse=True)
+    latest_file = json_files[0]
+    with open(os.path.join(GLOBAL_SAVES_DIR, latest_file), "r", encoding="utf-8") as f:
+        return json.load(f)
+
+def consolidate_global_saves():
+    """
+    Merge all JSON files in GLOBAL_SAVES_DIR into one consolidated file and delete older ones.
+    The union of game objects (using unique 'obj_id's) is computed.
+    Returns the consolidated state.
+    """
+    json_files = [f for f in os.listdir(GLOBAL_SAVES_DIR) if f.endswith(".json")]
+    if not json_files:
+        return None
+    merged_state = {"timestamp": "", "game_state": [], "player_position": {"x": 0, "y": 0, "z": 0}}
+    # Use a dictionary keyed by obj_id to union objects.
+    obj_dict = {}
+    latest_timestamp = None
+    latest_player_position = {"x": 0, "y": 0, "z": 0}
+    for f in json_files:
+        with open(os.path.join(GLOBAL_SAVES_DIR, f), "r", encoding="utf-8") as file:
+            data = json.load(file)
+            for obj in data.get("game_state", []):
+                obj_id = obj.get("obj_id")
+                if obj_id:
+                    obj_dict[obj_id] = obj
+            file_timestamp = data.get("timestamp")
+            if not latest_timestamp or file_timestamp > latest_timestamp:
+                latest_timestamp = file_timestamp
+                latest_player_position = data.get("player_position", {"x": 0, "y": 0, "z": 0})
+    merged_state["timestamp"] = latest_timestamp if latest_timestamp else time.strftime("%Y-%m-%d %H:%M:%S")
+    merged_state["game_state"] = list(obj_dict.values())
+    merged_state["player_position"] = latest_player_position
+    # Write the consolidated state with current timestamp.
+    consolidated_filename = f"consolidated_{datetime.now().strftime('%Y%m%d_%H%M%S')}.json"
+    consolidated_path = os.path.join(GLOBAL_SAVES_DIR, consolidated_filename)
+    with open(consolidated_path, "w", encoding="utf-8") as f:
+        json.dump(merged_state, f, indent=2)
+    # Delete all old JSON files except the newly consolidated one.
+    for f in json_files:
+        try:
+            os.remove(os.path.join(GLOBAL_SAVES_DIR, f))
+        except Exception as e:
+            st.error(f"Error deleting old global save {f}: {e}")
+    return merged_state
+
 @st.cache_data(ttl=3600)
 def load_plot_metadata():
     """Scans SAVE_DIR for plot files and returns metadata."""
@@ -42,9 +100,9 @@ def load_plot_metadata():
     parsed_plots = []
     for filename in plot_files:
         try:
-            parts = filename[:-4].split('_')  # Remove .csv extension
-            grid_x = int(parts[1][1:])  # After 'X'
-            grid_z = int(parts[2][1:])  # After 'Z'
+            parts = filename[:-4].split('_')
+            grid_x = int(parts[1][1:])
+            grid_z = int(parts[2][1:])
             plot_name = " ".join(parts[3:]) if len(parts) > 3 else f"Plot ({grid_x},{grid_z})"
             parsed_plots.append({
                 'id': filename[:-4],
@@ -110,14 +168,14 @@ def save_plot_data(filename, objects_data_list, plot_x_offset, plot_z_offset):
             continue
 
         relative_obj = {
-            'obj_id': obj_id, 
+            'obj_id': obj_id,
             'type': obj_type,
             'pos_x': pos.get('x', 0.0) - plot_x_offset,
             'pos_y': pos.get('y', 0.0),
             'pos_z': pos.get('z', 0.0) - plot_z_offset,
-            'rot_x': rot.get('_x', 0.0), 
+            'rot_x': rot.get('_x', 0.0),
             'rot_y': rot.get('_y', 0.0),
-            'rot_z': rot.get('_z', 0.0), 
+            'rot_z': rot.get('_z', 0.0),
             'rot_order': rot.get('_order', 'XYZ')
         }
         relative_objects.append(relative_obj)
@@ -134,7 +192,6 @@ def save_plot_data(filename, objects_data_list, plot_x_offset, plot_z_offset):
 # --- Initialize GameState Singleton ---
 @st.cache_resource
 def get_game_state():
-    # This instance is shared across all sessions and reruns.
     return GameState(save_dir=SAVE_DIR, csv_filename="world_state.csv")
 
 game_state = get_game_state()
@@ -147,17 +204,24 @@ if 'new_plot_name' not in st.session_state:
 if 'js_save_data_result' not in st.session_state:
     st.session_state.js_save_data_result = None
 if 'player_position' not in st.session_state:
-    # This can be updated from JS if needed
     st.session_state.player_position = {"x": 0, "y": 0, "z": 0}
 if 'loaded_global_state' not in st.session_state:
     st.session_state.loaded_global_state = None
 
+# --- On Client Start: Load Latest Global Save if Available ---
+latest_global_save = load_latest_global_save()
+if latest_global_save is not None:
+    with game_state.lock:
+        game_state.world_state = latest_global_save.get("game_state", [])
+    st.session_state.player_position = latest_global_save.get("player_position", {"x": 0, "y": 0, "z": 0})
+    st.session_state.loaded_global_state = latest_global_save
+
 plots_metadata = load_plot_metadata()
 all_initial_objects = []
 for plot in plots_metadata:
     all_initial_objects.extend(load_plot_objects(plot['filename'], plot['x_offset'], plot['z_offset']))
 
-# --- Update GameState with initial objects if empty ---
+# If GameState is still empty, update it with initial objects.
 if not game_state.get_state():
     game_state.update_state(all_initial_objects)
 
@@ -214,10 +278,12 @@ with st.sidebar:
         with open(save_file_path, "w", encoding="utf-8") as f:
              json.dump(global_save_data, f, indent=2)
         st.success(f"Global state saved to {default_save_name}")
-        # Also store it in session state for download purposes.
         st.session_state.loaded_global_state = global_save_data
+        # Consolidate all global saves into one file and delete older ones.
+        consolidated_state = consolidate_global_saves()
+        if consolidated_state is not None:
+            st.session_state.loaded_global_state = consolidated_state
 
-    # List global save files available in the folder.
     st.subheader("📂 Global Saves")
     save_files = sorted([f for f in os.listdir(GLOBAL_SAVES_DIR) if f.endswith(".json")])
     for file in save_files:
@@ -225,7 +291,6 @@ with st.sidebar:
             file_path = os.path.join(GLOBAL_SAVES_DIR, file)
             with open(file_path, "r", encoding="utf-8") as f:
                 loaded_save = json.load(f)
-            # Update the shared game state with loaded data.
             with game_state.lock:
                 game_state.world_state = loaded_save.get("game_state", [])
             st.session_state.player_position = loaded_save.get("player_position", {"x": 0, "y": 0, "z": 0})
@@ -234,7 +299,6 @@ with st.sidebar:
 
     st.markdown("---")
     st.header("Download Global Save as Markdown")
-    # Use the loaded global state if available; otherwise use a default dictionary.
     current_save = st.session_state.get("loaded_global_state")
     if current_save is None:
         current_save = {"timestamp": "N/A", "game_state": [], "player_position": {"x": 0, "y": 0, "z": 0}}
@@ -284,7 +348,6 @@ if save_data_from_js is not None:
                         st.success(f"New plot created and saved: {target_filename}")
                     else:
                         st.success(f"Updated existing plot: {target_filename}")
-                    # Update shared game state with new objects from this session
                     game_state.update_state(objects_to_save)
                     save_processed_successfully = True
                 else:
@@ -321,8 +384,6 @@ html_content_with_state = None
 try:
     with open(html_file_path, 'r', encoding='utf-8') as f:
         html_template = f.read()
-
-    # Use doubled curly braces for literal braces in the injected JS code.
     js_injection_script = f"""
 <script>
     window.ALL_INITIAL_OBJECTS = {json.dumps(injected_state["ALL_INITIAL_OBJECTS"])};