Use dirs dependency

Author: replydev

Cargo.toml

@@ -4,12 +4,10 @@ version = "0.0.9"
 authors = ["replydev <replydev@protonmail.com>"]
 edition = "2018"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 serde_json = "1.0.60"
 serde = { version = "1", features = ["derive"] }
-directories = "3.0.1"
+dirs = "3.0.1"
 rpassword = "5.0.0"
 sodiumoxide = "0.2.6"
 base64 = "0.13.0"

src/database_loader.rs

@@ -142,7 +142,7 @@ pub fn edit_element(mut id: usize, secret: &str,issuer: &str,label: &str) -> Res
     let mut elements: Vec<OTPElement>;
     match read_from_file(){
         Ok(result) => elements = result,
-        Err(e) => return Err(String::from("Cannot decrypt existing database"))
+        Err(_e) => return Err(String::from("Cannot decrypt existing database"))
     }
 
 
@@ -169,7 +169,8 @@ pub fn edit_element(mut id: usize, secret: &str,issuer: &str,label: &str) -> Res
 }
 
 pub fn export_database() -> Result<String, String> {
-    let exported_path = utils::get_home_folder() + "/exported.cotp";
+    let mut exported_path = utils::get_home_folder().to_str().unwrap().to_string();
+    exported_path.push_str("/exported.cotp");
     let mut file = File::create(&exported_path).expect("Cannot create file");
     let mut encrypted_contents = read_to_string(&get_db_path()).unwrap();
     let contents = cryptograpy::decrypt_string(&mut encrypted_contents, &cryptograpy::prompt_for_passwords("Password: "));

src/main.rs

@@ -1,6 +1,5 @@
 use std::env;
 mod database_loader;
-extern crate directories;
 mod utils;
 mod argument_functions;
 mod otp_helper;
@@ -36,6 +35,7 @@ fn main() {
             return;
         }
     }
+    println!("{}",utils::get_db_path().to_str().unwrap());
     let args: Vec<String> = env::args().collect();
     if !args_parser(args){
         utils::create_db_if_needed();

src/utils.rs

@@ -1,26 +1,23 @@
-use directories::BaseDirs;
 use std::fs::{File};
 use std::io::prelude::*;
-use std::path::Path;
+use std::path::{Path,PathBuf};
+use dirs::home_dir;
 use super::database_loader;
 
 #[cfg(debug_assertions)]
-pub fn get_db_path() -> String{
-    String::from("db.cotp")
+pub fn get_db_path() -> PathBuf{
+    PathBuf::from("db.cotp")
 }
 
 #[cfg(not(debug_assertions))]
-pub fn get_db_path() -> String{
-    let mut home_dir = get_home_folder();
-    home_dir.push_str("/.cotp");
-    home_dir.push_str("/db.cotp");
-    home_dir
+pub fn get_db_path() -> PathBuf{
+    let mut home_dir = get_home_folder().to_str().unwrap().to_string();
+    home_dir.push_str("/.cotp/db.cotp");
+    PathBuf::from(home_dir)
 }
 
-pub fn get_home_folder() -> String {
-    let base_dirs = BaseDirs::new().unwrap();
-    let home = base_dirs.home_dir().to_str().unwrap();
-    home.to_string()
+pub fn get_home_folder() -> PathBuf {
+    home_dir().unwrap()
 }
 
 pub fn create_db_if_needed(){