Move preference persistence to native

Author: timon-schelling

desktop/src/app.rs

@@ -201,6 +201,15 @@ impl WinitApp {
 					self.dispatch_desktop_wrapper_message(message);
 				}
 			}
+			DesktopFrontendMessage::PersistenceWritePreferences { content } => {
+				self.persistent_data.write_preferences(content);
+			}
+			DesktopFrontendMessage::PersistenceLoadPreferences => {
+				if let Some(content) = self.persistent_data.load_preferences() {
+					let message = DesktopWrapperMessage::LoadPreferences { content };
+					self.dispatch_desktop_wrapper_message(message);
+				}
+			}
 		}
 	}
 

desktop/src/consts.rs

@@ -1,7 +1,8 @@
 pub(crate) static APP_NAME: &str = "Graphite";
 pub(crate) static APP_ID: &str = "rs.graphite.GraphiteEditor";
 pub(crate) static APP_DIRECTORY_NAME: &str = "graphite-editor";
-pub(crate) static APP_AUTOSAVE_DIRECTORY_NAME: &str = "documents";
+pub(crate) static APP_STATE_FILE_NAME: &str = "state.ron";
+pub(crate) static APP_DOCUMENTS_DIRECTORY_NAME: &str = "documents";
 
 // CEF configuration constants
 pub(crate) const CEF_WINDOWLESS_FRAME_RATE: i32 = 60;

desktop/src/dirs.rs

@@ -1,7 +1,7 @@
 use std::fs::create_dir_all;
 use std::path::PathBuf;
 
-use crate::consts::{APP_AUTOSAVE_DIRECTORY_NAME, APP_DIRECTORY_NAME};
+use crate::consts::{APP_DIRECTORY_NAME, APP_DOCUMENTS_DIRECTORY_NAME};
 
 pub(crate) fn ensure_dir_exists(path: &PathBuf) {
 	if !path.exists() {
@@ -16,7 +16,7 @@ pub(crate) fn graphite_data_dir() -> PathBuf {
 }
 
 pub(crate) fn graphite_autosave_documents_dir() -> PathBuf {
-	let path = graphite_data_dir().join(APP_AUTOSAVE_DIRECTORY_NAME);
+	let path = graphite_data_dir().join(APP_DOCUMENTS_DIRECTORY_NAME);
 	ensure_dir_exists(&path);
 	path
 }

desktop/src/persist.rs

@@ -6,6 +6,7 @@ pub(crate) struct PersistentData {
 	current_document: Option<DocumentId>,
 	#[serde(skip)]
 	document_order: Option<Vec<DocumentId>>,
+	preferences: Option<String>,
 }
 
 impl PersistentData {
@@ -72,6 +73,15 @@ impl PersistentData {
 		self.flush();
 	}
 
+	pub(crate) fn write_preferences(&mut self, content: String) {
+		self.preferences = Some(content);
+		self.flush();
+	}
+
+	pub(crate) fn load_preferences(&self) -> Option<String> {
+		self.preferences.clone()
+	}
+
 	fn flush(&self) {
 		let data = match ron::to_string(self) {
 			Ok(d) => d,
@@ -110,7 +120,7 @@ impl PersistentData {
 
 	fn persistence_file_path() -> std::path::PathBuf {
 		let mut path = crate::dirs::graphite_data_dir();
-		path.push(format!("{}.ron", crate::consts::APP_AUTOSAVE_DIRECTORY_NAME));
+		path.push(crate::consts::APP_STATE_FILE_NAME);
 		path
 	}
 }

desktop/wrapper/src/handle_desktop_wrapper_message.rs

@@ -1,7 +1,7 @@
 use graphene_std::Color;
 use graphene_std::raster::Image;
 use graphite_editor::messages::app_window::app_window_message_handler::AppWindowPlatform;
-use graphite_editor::messages::prelude::{AppWindowMessage, DocumentMessage, PortfolioMessage};
+use graphite_editor::messages::prelude::{AppWindowMessage, DocumentMessage, PortfolioMessage, PreferencesMessage};
 
 use crate::messages::Platform;
 
@@ -134,5 +134,9 @@ pub(super) fn handle_desktop_wrapper_message(dispatcher: &mut DesktopWrapperMess
 			let message = PortfolioMessage::SelectDocument { document_id: id };
 			dispatcher.queue_editor_message(message.into());
 		}
+		DesktopWrapperMessage::LoadPreferences { content } => {
+			let message = PreferencesMessage::Load { preferences: content };
+			dispatcher.queue_editor_message(message.into());
+		}
 	}
 }

desktop/wrapper/src/intercept_frontend_message.rs

@@ -107,6 +107,12 @@ pub(super) fn intercept_frontend_message(dispatcher: &mut DesktopWrapperMessageD
 		FrontendMessage::TriggerLoadRestAutoSaveDocuments => {
 			dispatcher.respond(DesktopFrontendMessage::PersistenceLoadRemainingDocuments);
 		}
+		FrontendMessage::TriggerSavePreferences { preferences } => {
+			dispatcher.respond(DesktopFrontendMessage::PersistenceWritePreferences { content: preferences });
+		}
+		FrontendMessage::TriggerLoadPreferences => {
+			dispatcher.respond(DesktopFrontendMessage::PersistenceLoadPreferences);
+		}
 		m => return Some(m),
 	}
 	None

desktop/wrapper/src/messages.rs

@@ -50,6 +50,10 @@ pub enum DesktopFrontendMessage {
 	PersistenceUpdateDocumentsList {
 		ids: Vec<DocumentId>,
 	},
+	PersistenceWritePreferences {
+		content: String,
+	},
+	PersistenceLoadPreferences,
 	CloseWindow,
 }
 
@@ -66,6 +70,7 @@ pub enum DesktopWrapperMessage {
 	UpdatePlatform(Platform),
 	LoadDocument { id: DocumentId, document: Document, to_front: bool },
 	SelectDocument { id: DocumentId },
+	LoadPreferences { content: String },
 }
 
 #[derive(Clone, serde::Serialize, serde::Deserialize, Debug)]

editor/src/messages/frontend/frontend_message.rs

@@ -106,7 +106,7 @@ pub enum FrontendMessage {
 	TriggerOpenDocument,
 	TriggerPaste,
 	TriggerSavePreferences {
-		preferences: PreferencesMessageHandler,
+		preferences: String,
 	},
 	TriggerSaveActiveDocument {
 		#[serde(rename = "documentId")]

editor/src/messages/preferences/preferences_message_handler.rs

@@ -95,7 +95,9 @@ impl MessageHandler<PreferencesMessage, ()> for PreferencesMessageHandler {
 			}
 		}
 
-		responses.add(FrontendMessage::TriggerSavePreferences { preferences: self.clone() });
+		if let Ok(preferences) = serde_json::to_string(&self) {
+			responses.add(FrontendMessage::TriggerSavePreferences { preferences });
+		}
 	}
 
 	advertise_actions!(PreferencesMessageDiscriminant;

frontend/src/io-managers/persistence.ts

@@ -141,15 +141,15 @@ export function createPersistenceManager(editor: Editor, portfolio: PortfolioSta
 
 	// PREFERENCES
 
-	async function savePreferences(preferences: TriggerSavePreferences["preferences"]) {
+	async function savePreferences(preferences: string) {
 		await set("preferences", preferences, graphiteStore);
 	}
 
 	async function loadPreferences() {
-		const preferences = await get<Record<string, unknown>>("preferences", graphiteStore);
+		const preferences = await get<string>("preferences", graphiteStore);
 		if (!preferences) return;
 
-		editor.handle.loadPreferences(JSON.stringify(preferences));
+		editor.handle.loadPreferences(preferences);
 	}
 
 	// FRONTEND MESSAGE SUBSCRIPTIONS