File file creation and file writing

Author: replydev

src/database_loader.rs

@@ -189,14 +189,15 @@ pub fn export_database() -> Result<String, String> {
     }
 }
 
-pub fn overwrite_database(elements: Vec<OTPElement>){
-    let json_string: &str = &serde_json::to_string(&elements).unwrap();
-    overwrite_database_json(json_string);
+pub fn overwrite_database(elements: Vec<OTPElement>) -> Result<(),std::io::Error>{
+    let json_string: &str = &serde_json::to_string(&elements)?;
+    overwrite_database_json(json_string)
 }
 
-pub fn overwrite_database_json(json: &str){
+pub fn overwrite_database_json(json: &str) -> Result<(),std::io::Error>{
     let encrypted = cryptograpy::encrypt_string(json.to_string(), &cryptograpy::prompt_for_passwords("Insert password for database encryption: ",8));
-    utils::write_to_file(&encrypted, &mut File::create(utils::get_db_path()).expect("Failed to open file"));
+    let mut file = File::create(utils::get_db_path())?;
+    utils::write_to_file(&encrypted, &mut file)
 }
 
 fn check_elements(id: usize,elements: &Vec<OTPElement>) -> Result<(),String>{

src/main.rs

@@ -34,9 +34,12 @@ fn init() -> Result<(), String>{
         Ok(()) => {},
         Err(()) => {
             return Err(String::from("An error occurred during database creation"));
-        }
+        },
+    }
+    match database_loader::overwrite_database_json("[]"){
+        Ok(()) => Ok(()),
+        Err(_e) => Err(String::from("An error occurred during database overwriting")),
     }
-    Ok(())
 }
 
 fn main() {

src/utils.rs

@@ -27,21 +27,26 @@ fn get_cotp_folder() -> PathBuf{
 }
 
 pub fn create_db_if_needed() -> Result<(),()>{
-    if !get_cotp_folder().exists(){
-        match std::fs::create_dir(get_cotp_folder()){
+    let cotp_folder = get_cotp_folder();
+    if !cotp_folder.exists(){
+        match std::fs::create_dir(cotp_folder){
             Ok(()) => println!("Created .cotp folder"),
             Err(_e) => (),
         }
     }
-    if !Path::new(&get_db_path()).exists() {
-        database_loader::overwrite_database_json("[]");
+    let db_path = get_db_path();
+    if !db_path.exists() {
+        match std::fs::File::create(db_path){
+            Ok(_f) => return Ok(()),
+            Err(_e) => return Err(()),
+        }
     }
     Ok(())
 }
 
-pub fn write_to_file(content: &str, file: &mut File){
-    file.write_all(content.as_bytes()).expect("Error writing to file");
-    file.sync_all().expect("Sync failed");
+pub fn write_to_file(content: &str, file: &mut File) -> Result<(),std::io::Error>{
+    file.write_all(content.as_bytes())?;
+    file.sync_all()
 }
 
 pub fn print_progress_bar(){