From e1cdbd566a4f992a9ed570ac0b98f1c3ddcf4715 Mon Sep 17 00:00:00 2001
From: isark <mail@isark.me>
Date: Sat, 23 Mar 2024 10:39:11 +0100
Subject: [PATCH] Fixed issue with missing path on first plan load.

---
 src-tauri/src/storage.rs  | 7 ++-----
 src-tauri/tauri.conf.json | 2 +-
 src/app/_models/plan.ts   | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src-tauri/src/storage.rs b/src-tauri/src/storage.rs
index 778f145..4b3966c 100644
--- a/src-tauri/src/storage.rs
+++ b/src-tauri/src/storage.rs
@@ -103,14 +103,14 @@ impl Storage {
     }
 
     pub fn load_plan_at_path(path: PathBuf, save_local: bool) -> Option<Plan> {
-        let plan: Plan = match serde_json::from_str(&std::fs::read_to_string(&path).ok()?).ok() {
+        let mut plan: Plan = match serde_json::from_str(&std::fs::read_to_string(&path).ok()?).ok() {
             Some(plan) => plan,
             None => convert_old(path.clone())?,
         };
 
         if save_local {
             match Self::save_plan_at_store_path(path.file_name()?.to_str()?, plan.clone(), false) {
-                Ok(_) => (),
+                Ok(path) => plan.set_stored_path(Some(path)),
                 Err(_e) => {
                     log::error!("Could not save plan at store path during load");
                 }
@@ -149,9 +149,6 @@ impl Storage {
             log::info!("Overwriting plan : {file_path:?}");
         }
 
-        //TODO: Determine necessity
-        plan.set_stored_path(Some(file_path.clone()));
-
         std::fs::write(&file_path, serde_json::to_string(&plan)?)?;
 
         Ok(file_path.clone())
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index a2c42f5..5557061 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Nothing",
-    "version": "1.8.3"
+    "version": "1.8.4"
   },
   "tauri": {
     "systemTray": {
diff --git a/src/app/_models/plan.ts b/src/app/_models/plan.ts
index a9e2975..48faef5 100644
--- a/src/app/_models/plan.ts
+++ b/src/app/_models/plan.ts
@@ -30,7 +30,7 @@ export class Plan {
     identifier?: string;
     last_stored_time?: string;
 
-    private path?: string;
+    public path?: string;
     private selfSaveSubject: Subject<void> = new Subject<void>();