src/inv.rs

@@ -58,8 +58,8 @@ pub fn list(slot: &str, dir: &str) -> Result<()> {
     }
 
     let mut slotdir: PathBuf = match slot {
-        "active" | "a" => common::env_config()?.active_dir,
-        "inactive" | "i" => common::env_config()?.inactive_dir,
+        "active" | "a" => common::env_config()?.active_dir.clone(),
+        "inactive" | "i" => common::env_config()?.inactive_dir.clone(),
         _ => PathBuf::new(),
     };
 

src/item.rs

@@ -36,8 +36,8 @@ pub fn take(file: &String, slot: &str) -> Result<()> {
         );
     };
     let slotdir: PathBuf = match slot {
-        "active" | "a" => common::env_config()?.active_dir,
-        "inactive" | "i" => common::env_config()?.inactive_dir,
+        "active" | "a" => common::env_config()?.active_dir.clone(),
+        "inactive" | "i" => common::env_config()?.inactive_dir.clone(),
         _ => PathBuf::new(),
     };
 
@@ -55,10 +55,20 @@ pub fn take(file: &String, slot: &str) -> Result<()> {
     };
 
     let sourcepath: PathBuf = Path::new(&file).to_path_buf();
-    let mut sourcelocation: PathBuf = fs::canonicalize(&sourcepath)?;
-    sourcelocation.pop();
-    let filename = Path::new(&file).file_name().unwrap().to_str().unwrap();
-    let destpath: PathBuf = [&slotdir, &sourcepath].iter().collect();
+    let destpath: PathBuf = [
+        &slotdir,
+        &Path::new(
+            &Path::new(&file)
+                .file_name()
+                .unwrap()
+                .to_os_string()
+                .to_str()
+                .unwrap(),
+        )
+        .to_path_buf(),
+    ]
+    .iter()
+    .collect();
 
     if Path::exists(&destpath) {
         // Checks if there's a file with the same name in the inventory.
@@ -79,13 +89,6 @@ pub fn take(file: &String, slot: &str) -> Result<()> {
         bail!("{}", "No such file or directory.".red());
     }
 
-    println!(
-        "✅ {} {} {} ",
-        "Took".green(),
-        &filename.bold(),
-        format!("from {}", &sourcelocation.to_str().unwrap()).green()
-    );
-
     Ok(())
 }
 
@@ -102,8 +105,8 @@ pub fn drop(file: &String, slot: &str, dest: PathBuf) -> Result<()> {
     };
 
     let slotdir: PathBuf = match slot {
-        "active" | "a" => common::env_config()?.active_dir,
-        "inactive" | "i" => common::env_config()?.inactive_dir,
+        "active" | "a" => common::env_config()?.active_dir.clone(),
+        "inactive" | "i" => common::env_config()?.inactive_dir.clone(),
         _ => PathBuf::new(),
     };
 
@@ -121,7 +124,7 @@ pub fn drop(file: &String, slot: &str, dest: PathBuf) -> Result<()> {
     };
 
     let sourcepath: PathBuf = [&slotdir, &Path::new(file).to_path_buf()].iter().collect();
-    let mut destpath: PathBuf = [
+    let destpath: PathBuf = [
         Path::new(&dest).to_path_buf(),
         Path::new(file).to_path_buf(),
     ]
@@ -144,15 +147,5 @@ pub fn drop(file: &String, slot: &str, dest: PathBuf) -> Result<()> {
     } else {
         bail!("{}", "No such file or directory.".red());
     }
-
-    destpath.pop();
-
-    println!(
-        "✅ {} {} {} ",
-        "Dropped".green(),
-        &file.bold(),
-        format!("into {}", &destpath.to_str().unwrap()).green()
-    );
-
     Ok(())
 }