Update app.py

app.py

@@ -25,8 +25,10 @@ def load_plot_metadata():
     """Scans save dir for plot_X*_Z*.csv, sorts, calculates metadata."""
     plots = []
     plot_files = []
+    st.write(f"Scanning directory: {os.path.abspath(SAVE_DIR)}") # Debug print
     try:
-        plot_files = [f for f in os.listdir(SAVE_DIR) if f.endswith(".csv") and f.startswith("plot_X")]
+        plot_files = sorted([f for f in os.listdir(SAVE_DIR) if f.endswith(".csv") and f.startswith("plot_X")])
+        st.write(f"Found files: {plot_files}") # Debug print
     except FileNotFoundError:
         st.error(f"Save directory '{SAVE_DIR}' not found.")
         return []
@@ -59,7 +61,7 @@ def load_plot_metadata():
 
     # Sort primarily by X, then by Z
     parsed_plots.sort(key=lambda p: (p['grid_x'], p['grid_z']))
-
+    st.write(f"Loaded metadata for {len(parsed_plots)} plots.") # Debug print
     return parsed_plots
 
 def load_plot_objects(filename, x_offset, z_offset):
@@ -70,7 +72,7 @@ def load_plot_objects(filename, x_offset, z_offset):
         df = pd.read_csv(file_path)
         # Check required columns
         if not all(col in df.columns for col in ['type', 'pos_x', 'pos_y', 'pos_z']):
-             st.warning(f"CSV '{filename}' missing essential columns. Skipping.")
+             # st.warning(f"CSV '{filename}' missing essential columns. Skipping.") # Can be noisy
              return []
         # Add defaults for optional columns
         df['obj_id'] = df.get('obj_id', pd.Series([str(uuid.uuid4()) for _ in range(len(df))]))
@@ -124,7 +126,8 @@ def save_plot_data(filename, objects_data_list, plot_x_offset, plot_z_offset):
     try:
         df = pd.DataFrame(relative_objects, columns=CSV_COLUMNS)
         df.to_csv(file_path, index=False)
-        st.success(f"Saved {len(relative_objects)} objects to {filename}")
+        # Success message handled in the calling block
+        # st.success(f"Saved {len(relative_objects)} objects to {filename}")
         return True
     except Exception as e:
         st.error(f"Failed to save plot data to {filename}: {e}")
@@ -135,22 +138,34 @@ st.set_page_config( page_title="Infinite World Builder", layout="wide")
 
 # --- Initialize Session State ---
 if 'selected_object' not in st.session_state: st.session_state.selected_object = 'None'
-if 'new_plot_name' not in st.session_state: st.session_state.new_plot_name = "" # No longer used for filename
+# Removed 'new_plot_name' state as it wasn't used for saving anymore
 if 'js_save_data_result' not in st.session_state: st.session_state.js_save_data_result = None
 
 # --- Load Plot Metadata ---
-# This is now the source of truth for saved plots
+# Cached function returns list of plots
+# Note: next_plot_x_offset isn't returned/needed anymore
 plots_metadata = load_plot_metadata()
 
 # --- Load ALL Objects for Rendering ---
 all_initial_objects = []
+st.write(f"Loading objects for {len(plots_metadata)} plots...") # Debug
 for plot in plots_metadata:
+    loaded_count = len(all_initial_objects)
     all_initial_objects.extend(load_plot_objects(plot['filename'], plot['x_offset'], plot['z_offset']))
+    # st.write(f"  Loaded {len(all_initial_objects) - loaded_count} objects from {plot['filename']}") # Verbose Debug
+st.write(f"Total objects loaded: {len(all_initial_objects)}") # Debug
 
 # --- Sidebar ---
 with st.sidebar:
     st.title("🏗️ World Controls")
 
+    # *** NEW: Refresh Button ***
+    if st.button("🔄 Refresh World View", key="refresh_button"):
+        st.info("Clearing cache and reloading world data...")
+        load_plot_metadata.clear() # Clear the cache for plot metadata
+        # No need to clear all_initial_objects, it's rebuilt after rerun
+        st.rerun() # Force the script to rerun from the top
+
     st.header("Navigation (Plots)")
     st.caption("Click to teleport player to a plot.")
     max_cols = 2 # Adjust columns for potentially more buttons
@@ -161,11 +176,11 @@ with st.sidebar:
     for plot in sorted_plots_for_nav:
         button_label = f"➡️ {plot.get('name', plot['id'])} ({plot['grid_x']},{plot['grid_z']})"
         if cols[col_idx].button(button_label, key=f"nav_{plot['id']}"):
-            target_x = plot['x_offset']
-            target_z = plot['z_offset'] # Use Z offset too
+            # Teleport near center of plot
+            target_x = plot['x_offset'] + PLOT_WIDTH / 2
+            target_z = plot['z_offset'] + PLOT_DEPTH / 2
             try:
-                # Tell JS where to teleport (center of plot approx)
-                js_code = f"teleportPlayer({target_x + PLOT_WIDTH/2}, {target_z + PLOT_DEPTH/2});"
+                js_code = f"teleportPlayer({target_x}, {target_z});"
                 streamlit_js_eval(js_code=js_code, key=f"teleport_{plot['id']}")
             except Exception as e:
                  st.error(f"Failed to send teleport command: {e}")
@@ -182,7 +197,7 @@ with st.sidebar:
     )
     if selected_object_type_widget != st.session_state.selected_object:
          st.session_state.selected_object = selected_object_type_widget
-         # Rerun will happen, JS reloads state via sessionStorage, Python injects new selection
+         # Selecting causes rerun, state injection handles update in JS, sessionStorage preserves placed objects
 
     st.markdown("---")
 
@@ -191,60 +206,53 @@ with st.sidebar:
     st.caption("Saves newly placed objects to the plot the player is currently in. If it's a new area, a new plot file is created.")
     if st.button("💾 Save Current Work", key="save_button"):
         # Trigger JS to get data AND player position
-        js_get_data_code = "getSaveDataAndPosition();" # JS function needs update
-        streamlit_js_eval(js_code=js_get_data_code, key="js_save_processor")
+        js_get_data_code = "getSaveDataAndPosition();" # JS function name
+        streamlit_js_eval(js_code=js_get_data_code, key="js_save_processor") # Store result
         st.rerun() # Rerun to process result
 
 
 # --- Process Save Data ---
 save_data_from_js = st.session_state.get("js_save_processor", None)
 
-if save_data_from_js is not None:
+if save_data_from_js is not None: # Process only if data is present
     st.info("Received save data from client...")
     save_processed_successfully = False
     try:
-        # Expecting { playerPosition: {x,y,z}, objectsToSave: [...] }
         payload = json.loads(save_data_from_js) if isinstance(save_data_from_js, str) else save_data_from_js
 
         if isinstance(payload, dict) and 'playerPosition' in payload and 'objectsToSave' in payload:
             player_pos = payload['playerPosition']
             objects_to_save = payload['objectsToSave']
 
-            if isinstance(objects_to_save, list): # Allow saving empty list (clears new objects)
+            if isinstance(objects_to_save, list): # Allow saving empty list
                 # Determine target plot based on player position
                 target_grid_x = math.floor(player_pos.get('x', 0.0) / PLOT_WIDTH)
-                target_grid_z = math.floor(player_pos.get('z', 0.0) / PLOT_DEPTH) # Use Z pos too
+                target_grid_z = math.floor(player_pos.get('z', 0.0) / PLOT_DEPTH)
 
                 target_filename = f"plot_X{target_grid_x}_Z{target_grid_z}.csv"
                 target_plot_x_offset = target_grid_x * PLOT_WIDTH
                 target_plot_z_offset = target_grid_z * PLOT_DEPTH
 
                 st.write(f"Attempting to save plot: {target_filename} (Player at: x={player_pos.get('x', 0):.1f}, z={player_pos.get('z', 0):.1f})")
-
-                # Check if this plot already exists in metadata (for logging/future logic)
                 is_new_plot_file = not os.path.exists(os.path.join(SAVE_DIR, target_filename))
 
+                # --- Save the data ---
                 save_ok = save_plot_data(target_filename, objects_to_save, target_plot_x_offset, target_plot_z_offset)
 
                 if save_ok:
-                    load_plot_metadata.clear() # Clear cache to force reload metadata
+                    load_plot_metadata.clear() # Clear cache crucial for others/refresh
                     try: # Tell JS to clear its unsaved state
                          streamlit_js_eval(js_code="resetNewlyPlacedObjects();", key="reset_js_state")
                     except Exception as js_e:
                          st.warning(f"Could not reset JS state after save: {js_e}")
 
-                    if is_new_plot_file:
-                        st.success(f"New plot created and saved: {target_filename}")
-                    else:
-                        st.success(f"Updated existing plot: {target_filename}")
+                    if is_new_plot_file: st.success(f"New plot created and saved: {target_filename}")
+                    else: st.success(f"Updated existing plot: {target_filename}")
                     save_processed_successfully = True
                 else:
                     st.error(f"Failed to save plot data to file: {target_filename}")
-            else:
-                st.error("Invalid 'objectsToSave' format received (expected list).")
-        else:
-            st.error("Invalid save payload structure received from client.")
-            print("Received payload:", payload) # Log for debugging
+            else: st.error("Invalid 'objectsToSave' format (expected list).")
+        else: st.error("Invalid save payload structure received.")
 
     except json.JSONDecodeError:
         st.error("Failed to decode save data from client.")
@@ -253,30 +261,31 @@ if save_data_from_js is not None:
         st.error(f"Error processing save: {e}")
         st.exception(e)
 
-    # Clear the trigger data from session state
+    # Clear the trigger data from session state IMPORTANT!
     st.session_state.js_save_processor = None
-    # Rerun after processing to reflect changes
+    # Rerun after processing save to reflect changes
     if save_processed_successfully:
         st.rerun()
 
 
 # --- Main Area ---
 st.header("Infinite Shared 3D World")
-st.caption("Move to empty areas to expand the world. Use sidebar 'Save' to save work to current plot.")
+st.caption(f"Location: {os.getcwd()}. Saving to sub-directory: '{SAVE_DIR}'. Plots loaded: {len(plots_metadata)}")
 
 # --- Load and Prepare HTML ---
 html_file_path = 'index.html'
-html_content_with_state = None
+html_content_with_state = None # Initialize
 
 try:
     with open(html_file_path, 'r', encoding='utf-8') as f:
         html_template = f.read()
 
     # --- Inject Python state into JavaScript ---
+    # Send plot metadata so JS knows where existing ground is
     js_injection_script = f"""
 <script>
     window.ALL_INITIAL_OBJECTS = {json.dumps(all_initial_objects)};
-    window.PLOTS_METADATA = {json.dumps(plots_metadata)}; // Send plot info to JS
+    window.PLOTS_METADATA = {json.dumps(plots_metadata)};
     window.SELECTED_OBJECT_TYPE = {json.dumps(st.session_state.selected_object)};
     window.PLOT_WIDTH = {json.dumps(PLOT_WIDTH)};
     window.PLOT_DEPTH = {json.dumps(PLOT_DEPTH)};