feat: canonicalize project root path

Cubxity · May 8, 2023 · 58d39e3 · 58d39e3
1 parent 18b5e4d
commit 58d39e3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/src-tauri/src/ipc/model.rs b/src-tauri/src/ipc/model.rs
@@ -36,7 +36,7 @@ pub struct ProjectChangeEvent {
 
 #[derive(Serialize, Clone, Debug)]
 pub struct ProjectModel {
-    pub root: String,
+    pub root: PathBuf,
 }
 
 #[derive(Serialize, Clone, Debug)]

diff --git a/src-tauri/src/menu.rs b/src-tauri/src/menu.rs
@@ -10,13 +10,14 @@ pub fn handle_menu_event<R: Runtime>(e: WindowMenuEvent<R>) {
             .set_title("Open Project")
             .pick_folder(move |path| {
                 if let Some(path) = path {
+                    let path = fs::canonicalize(&path).unwrap_or(path);
+
                     let window = e.window();
                     let project_manager: State<'_, Arc<ProjectManager<_>>> = window.state();
-                    let path_clone = path.clone();
                     let project = Arc::new(Project {
-                        root: path,
-                        world: ProjectWorld::new(path_clone).into(),
+                        world: ProjectWorld::new(path.clone()).into(),
                         cache: RwLock::new(Default::default()),
+                        root: path,
                     });
                     project_manager.set_project(window, Some(project));
                 }

diff --git a/src-tauri/src/project/project.rs b/src-tauri/src/project/project.rs
@@ -67,7 +67,7 @@ impl<R: Runtime> ProjectManager<R> {
     pub fn set_project(&self, window: &Window<R>, project: Option<Arc<Project>>) {
         let mut projects = self.projects.write().unwrap();
         let model = project.as_ref().map(|p| ProjectModel {
-            root: p.root.clone().into_os_string().into_string().unwrap(),
+            root: p.root.clone(),
         });
         match project {
             None => {
@@ -92,11 +92,7 @@ impl<R: Runtime> ProjectManager<R> {
             }
         };
 
-        info!(
-            "project set for window {}: {:?}",
-            window.label(),
-            model.as_ref().map(|m| &m.root)
-        );
+        info!("project set for window {}: {:?}", window.label(), model);
         let _ = window.emit("project_changed", ProjectChangeEvent { project: model });
     }