Create directories on save rather than load

Author: Freaky

hashfilter/src/lib.rs

@@ -63,6 +63,10 @@ impl HashFilter {
             return Ok(());
         }
 
+        if let Some(dir) = self.path.as_ref().and_then(|p| p.parent()) {
+            std::fs::create_dir_all(dir)?;
+        }
+
         let mut file = OpenOptions::new()
             .write(true)
             .create(true)

src/persistence.rs

@@ -1,4 +1,3 @@
-
 use directories::ProjectDirs;
 
 use crate::filesdb::FilesDb;
@@ -7,16 +6,6 @@ use crate::settings;
 pub fn load() {
     let dirs = ProjectDirs::from("", "Freaky", "Compactor").expect("dirs");
 
-    if !dirs.cache_dir().exists() {
-        let _ = std::fs::create_dir_all(dirs.cache_dir());
-    }
-
     FilesDb::borrow().set_backing(dirs.cache_dir().join("incompressible.dat"));
-
-
-    if !dirs.config_dir().exists() {
-        let _ = std::fs::create_dir_all(dirs.config_dir());
-    }
-
     settings::load(dirs.config_dir().join("config.json"));
 }

src/settings.rs

@@ -84,24 +84,30 @@ impl Settings {
     }
 
     pub fn load(&mut self) {
-        if self.backing.is_none() {
-            return;
-        }
-
-        if let Ok(data) = std::fs::read(self.backing.as_ref().unwrap()) {
-            if let Ok(c) = serde_json::from_slice::<Config>(&data) {
-                self.set(c);
+        match &self.backing {
+            Some(path) => {
+                if let Ok(data) = std::fs::read(path) {
+                    if let Ok(c) = serde_json::from_slice::<Config>(&data) {
+                        self.set(c);
+                    }
+                }
             }
+            None => (),
         }
     }
 
-    pub fn save(&mut self) {
-        if self.backing.is_none() {
-            return;
-        }
+    pub fn save(&mut self) -> std::io::Result<()> {
+        match &self.backing {
+            Some(path) => {
+                if let Some(dir) = path.parent() {
+                    std::fs::create_dir_all(dir)?;
+                }
 
-        let data = serde_json::to_string_pretty(&self.config).expect("Serialize");
-        let _ = std::fs::write(self.backing.as_ref().unwrap(), &data);
+                let data = serde_json::to_string_pretty(&self.config).expect("Serialize");
+                std::fs::write(path, &data)
+            }
+            None => Ok(()),
+        }
     }
 
     pub fn set(&mut self, c: Config) {