replace panics with Result

2 files changed, 13 insertions, 12 deletions

diff --git a/src/wg/config.rs b/src/wg/config.rs
index 4a07287..2dac6a8 100644
--- a/src/wg/config.rs
+++ b/src/wg/config.rs
@@ -193,4 +193,4 @@ fn config_value(line: &str) -> Result<&str> {
             Err(anyhow!("line does not seem to contain a key-value pair"))
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/wg/peer.rs b/src/wg/peer.rs
index c374ca0..1f9a173 100644
--- a/src/wg/peer.rs
+++ b/src/wg/peer.rs
@@ -6,7 +6,7 @@ use std::path::{Path};
 use std::process::{Command, Stdio};
 use std::io::Write as ioWrite;
 
-use anyhow::{Context, Result};
+use anyhow::{Context, Result, anyhow};
 
 use super::config::WireguardConfig;
 
@@ -52,38 +52,39 @@ impl Peer {
             public_key: String::from(public_key)
         };
 
-        let mut f = File::create(p.private_key_path()).context(format!("could not create file {}", p.private_key_path()))?;
-        write!(f, "{}", private_key).expect("could not write private key to file");
+        let pk_path = p.private_key_path()?;
+        let mut f = File::create(pk_path.clone()).context(format!("could not create file {}", pk_path))?;
+        write!(f, "{}", private_key).context("could not write private key to file")?;
 
 
         Ok(p)
     }
 
-    fn private_key_folder(&self) -> String {
+    fn private_key_folder(&self) -> Result<String> {
         let pk_folder = String::from("./private_keys/");
 
         let pk_path = Path::new(pk_folder.as_str());
         if !pk_path.exists() {
-            fs::create_dir(pk_path).expect("Could not create private keys folder");
+            fs::create_dir(pk_path).context(format!("creating {} folder", pk_folder))?;
         }
 
         if !pk_path.is_dir() {
-            panic!("Error: the private key folder exists but is not a directory")
+            return Err(anyhow!("Error: the private key folder exists but is not a directory"));
         }
 
-        pk_folder
+        Ok(pk_folder)
     }
 
-    fn private_key_path(&self) -> String {
-        let folder_name = self.private_key_folder();
+    fn private_key_path(&self) -> Result<String> {
+        let folder_name = self.private_key_folder()?;
         let pk_folder = Path::new(folder_name.as_str());
         let pk_path = pk_folder.join(self.name.clone());
 
-        String::from(pk_path.to_str().unwrap())
+        Ok(String::from(pk_path.to_str().unwrap()))
     }
 
     pub fn private_key(&self) -> Result<String> {
-        let pk_folder = self.private_key_folder();
+        let pk_folder = self.private_key_folder()?;
         let pk_path = join_paths(&[pk_folder, self.name.clone()])?;
         let pk = read_to_string(pk_path)?;