Review

Author: timon-schelling

desktop/src/app.rs

@@ -288,6 +288,8 @@ impl App {
 			DesktopFrontendMessage::PersistenceReadDocument { id } => {
 				if let Some(document_serialized_content) = persist::read_document_content(&id) {
 					responses.push(DesktopWrapperMessage::LoadDocumentContent { id, document_serialized_content });
+				} else {
+					tracing::error!("Failed to read document content for {id:?}");
 				}
 			}
 			DesktopFrontendMessage::PersistenceWriteDocument { id, document_serialized_content } => {

desktop/src/persist.rs

@@ -26,8 +26,17 @@ pub(crate) fn read_state() -> PersistedState {
 }
 
 pub(crate) fn write_state(state: PersistedState) {
-	flush(&state);
-	garbage_collect_document_files(&state);
+	let state: &PersistedState = &state;
+	let data = match ron::ser::to_string_pretty(state, Default::default()) {
+		Ok(d) => d,
+		Err(e) => {
+			tracing::error!("Failed to serialize persistent data: {e}");
+			return;
+		}
+	};
+	if let Err(e) = std::fs::write(state_file_path(), data) {
+		tracing::error!("Failed to write persistent data to disk: {e}");
+	}
 }
 
 pub(crate) fn write_document_content(id: DocumentId, document_content: String) {
@@ -46,19 +55,6 @@ pub(crate) fn delete_document(id: &DocumentId) {
 	}
 }
 
-fn flush(state: &PersistedState) {
-	let data = match ron::ser::to_string_pretty(state, Default::default()) {
-		Ok(d) => d,
-		Err(e) => {
-			tracing::error!("Failed to serialize persistent data: {e}");
-			return;
-		}
-	};
-	if let Err(e) = std::fs::write(state_file_path(), data) {
-		tracing::error!("Failed to write persistent data to disk: {e}");
-	}
-}
-
 fn garbage_collect_document_files(state: &PersistedState) {
 	let valid_paths: std::collections::HashSet<_> = state.documents.iter().map(|doc| document_content_path(&doc.id)).collect();
 

editor/src/messages/portfolio/persistent_state/persistent_state_message_handler.rs

@@ -27,11 +27,9 @@ impl MessageHandler<PersistentStateMessage, PersistentStateMessageContext> for P
 			}
 			PersistentStateMessage::WriteDocument { document_id, document } => {
 				responses.add(FrontendMessage::TriggerPersistenceWriteDocument { document_id, document });
-				responses.add(FrontendMessage::TriggerPersistenceWriteState { state });
 			}
 			PersistentStateMessage::DeleteDocument { document_id } => {
 				responses.add(FrontendMessage::TriggerPersistenceDeleteDocument { document_id });
-				responses.add(FrontendMessage::TriggerPersistenceWriteState { state });
 			}
 		}
 	}

editor/src/messages/portfolio/portfolio_message_handler.rs

@@ -174,19 +174,17 @@ impl MessageHandler<PortfolioMessage, PortfolioMessageContext<'_>> for Portfolio
 				}
 			}
 			PortfolioMessage::AutoSaveAllDocuments => {
-				for document_id in self.document_ids.iter().copied().collect::<Vec<_>>() {
-					if let Some(document) = self.documents.get_mut(&document_id)
+				for document_id in self.document_ids.iter() {
+					if let Some(document) = self.documents.get_mut(document_id)
 						&& !document.is_auto_saved()
 					{
 						document.set_auto_save_state(true);
-						responses.add(PortfolioMessage::AutoSaveDocument { document_id });
+						responses.add(PortfolioMessage::AutoSaveDocument { document_id: *document_id });
 					}
 				}
 			}
 			PortfolioMessage::AutoSaveDocument { document_id } => {
-				let Some(document) = self.document(document_id) else {
-					return;
-				};
+				let Some(document) = self.document(document_id) else { return };
 				responses.add(PersistentStateMessage::WriteDocument {
 					document_id,
 					document: document.serialize_document(),
@@ -367,6 +365,7 @@ impl MessageHandler<PortfolioMessage, PortfolioMessageContext<'_>> for Portfolio
 				self.document_ids.clear();
 				self.active_document_id = None;
 				responses.add(MenuBarMessage::SendLayout);
+				responses.add(PersistentStateMessage::WriteState);
 			}
 			PortfolioMessage::FontCatalogLoaded { catalog } => {
 				self.cached_data.font_catalog = catalog;

editor/src/test_utils.rs

@@ -36,15 +36,15 @@ impl EditorTestUtils {
 		async fn run<'a>(editor: &'a mut Editor, runtime: &'a mut NodeRuntime) -> Result<Instrumented, String> {
 			let portfolio = &mut editor.dispatcher.message_handlers.portfolio_message_handler;
 			let document_id = portfolio.active_document_id.unwrap();
-			let exector = &mut portfolio.executor;
-			let document = portfolio.document_mut(document_id).unwrap();
+			let (executor, documents) = (&mut portfolio.executor, &mut portfolio.documents);
+			let document = documents.get_mut(&document_id).unwrap();
 
-			let instrumented = match exector.update_node_graph_instrumented(document) {
+			let instrumented = match executor.update_node_graph_instrumented(document) {
 				Ok(instrumented) => instrumented,
 				Err(e) => return Err(format!("update_node_graph_instrumented failed\n\n{e}")),
 			};
 
-			if let Err(e) = exector.submit_current_node_graph_evaluation(document, document_id, UVec2::ONE, 1., Default::default(), DVec2::ZERO) {
+			if let Err(e) = executor.submit_current_node_graph_evaluation(document, document_id, UVec2::ONE, 1., Default::default(), DVec2::ZERO) {
 				return Err(format!("submit_current_node_graph_evaluation failed\n\n{e}"));
 			}
 			runtime.run().await;