Database empty checks

Author: replydev

src/argument_functions.rs

@@ -8,8 +8,8 @@ pub fn help(){
     println!();
     println!("ARGUMENTS:");
     println!("  -a,--add [SECRET] [ISSUER] [LABEL]       | Add a new OTP code");
-    println!("  -r,--remove [SECRET] [ISSUER] [LABEL]    | Remove an OTP code");
     println!("  -e,--edit [ID] [SECRET] [ISSUER] [LABEL] | Edit an OTP code");
+    println!("  -r,--remove [ID]                         | Remove an OTP code");
     println!("  -i,--import [APPNAME] [PATH]             | Import a backup from a given application");
     println!("  -ex,--export                             | Export the entire database in a plaintext json format");
     println!("  -j,--json                                | Print results in json format");
@@ -111,7 +111,10 @@ pub fn export(args: Vec<String>){
 
 pub fn json(args: Vec<String>){
     if args.len() == 2{
-        println!("{}",otp_helper::get_json_results().expect("Failed to get json results"));
+        match otp_helper::get_json_results(){
+            Ok(results) => println!("{}",results),
+            Err(e) => println!("An error occurred while getting json result: {}",e),
+        }
     }
     else{
         println!("Invalid argument, type cotp --json");
@@ -122,7 +125,12 @@ pub fn single(args: Vec<String>){
     if args.len() == 2{
         match otp_helper::read_codes(){
             Ok(result) => {
-                otp_helper::show_codes(&result);
+                if result.len() == 0{
+                    println!("No codes, type \"cotp -h\" to get help");
+                }
+                else{
+                    otp_helper::show_codes(&result);
+                }
             },
             Err(e) => println!("An error occurred: {}",e)
         }

src/database_loader.rs

@@ -119,18 +119,19 @@ pub fn remove_element_from_db(mut id: usize) -> Result<(),String>{
         }
     }
 
-    if id >= elements.len(){
-        return Err(format!("{} is a bad index",id+1));
-    }
-
-    for i in 0..elements.len(){
-        if i == id {
-            elements.remove(i);
-            break;
-        }
-    }
-    overwrite_database(elements);
-    Ok(())
+    match check_elements(id, &elements){
+        Ok(()) => {
+            for i in 0..elements.len(){
+                if i == id {
+                    elements.remove(i);
+                    break;
+                }
+            }
+            overwrite_database(elements);
+            Ok(())
+        },
+        Err(e) => Err(e)
+    } 
 }
 
 pub fn edit_element(mut id: usize, secret: &str,issuer: &str,label: &str) -> Result<(), String> {
@@ -144,28 +145,28 @@ pub fn edit_element(mut id: usize, secret: &str,issuer: &str,label: &str) -> Res
         Ok(result) => elements = result,
         Err(_e) => return Err(String::from("Cannot decrypt existing database"))
     }
-    
 
-    if id >= elements.len() {
-        return Err(String::from("Invalid element"));
-    }
-
-    for i in 0..elements.len() {
-        if i == id{
-            if secret != "."{
-                elements[i].set_secret(secret.to_string());
-            }
-            if issuer != "."{
-                elements[i].set_issuer(issuer.to_string());
-            }
-            if label != "."{
-                elements[i].set_label(label.to_string());
+    match check_elements(id,&elements){
+        Ok(()) => {
+            for i in 0..elements.len() {
+                if i == id{
+                    if secret != "."{
+                        elements[i].set_secret(secret.to_string());
+                    }
+                    if issuer != "."{
+                        elements[i].set_issuer(issuer.to_string());
+                    }
+                    if label != "."{
+                        elements[i].set_label(label.to_string());
+                    }
+                    break;
+                }
             }
-            break;
-        }
+            overwrite_database(elements);
+            Ok(())
+        },
+        Err(e) => Err(e)
     }
-    overwrite_database(elements);
-    Ok(())
 }
 
 pub fn export_database() -> Result<String, String> {
@@ -176,6 +177,9 @@ pub fn export_database() -> Result<String, String> {
     let contents = cryptograpy::decrypt_string(&encrypted_contents, &cryptograpy::prompt_for_passwords("Password: "));
     match contents {
         Ok(contents) => {
+            if contents == "[]"{
+                return Err(String::from("there are no elements in your database, type \"cotp -h\" to get help"));
+            }
             file.write_all(contents.as_bytes()).expect("Failed to write contents");
             return Ok(exported_path);
         },
@@ -195,3 +199,15 @@ pub fn overwrite_database_json(json: &str){
     utils::write_to_file(&encrypted, &mut File::create(utils::get_db_path()).expect("Failed to open file"));
 }
 
+fn check_elements(id: usize,elements: &Vec<OTPElement>) -> Result<(),String>{
+    if elements.len() == 0{
+        return Err(String::from("there are no elements in your database. Type \"cotp -h\" to get help."));
+    }
+
+    if id >= elements.len(){
+        return Err(format!("{} is a bad index",id+1));
+    }
+
+    Ok(())
+}
+

src/main.rs

@@ -54,11 +54,16 @@ fn dashboard(){
     let mut lines;
     match otp_helper::read_codes(){
         Ok(elements) => {
-            loop{
-                utils::print_progress_bar();
-                lines = otp_helper::show_codes(&elements);
-                sleep(Duration::from_millis(1000));
-                print!("\x1B[{}A", lines + 1);
+            if elements.len() == 0{
+                println!("No codes, type \"cotp -h\" to get help");
+            }
+            else{
+                loop{
+                    utils::print_progress_bar();
+                    lines = otp_helper::show_codes(&elements);
+                    sleep(Duration::from_millis(1000));
+                    print!("\x1B[{}A", lines + 1);
+                }
             }
         },
         Err(e) => println!("An error as occurred: {}",e),

src/otp_helper.rs

@@ -66,6 +66,10 @@ pub fn get_json_results() -> Result<String,String>{
     }
     let mut results: Vec<JsonResult> = Vec::new();
 
+    if elements.len() == 0{
+        return Err(String::from("there are no elements in your database, type \"cotp -h\" to get help"));
+    }
+
     for i in 0..elements.len() {
         let otp_code = get_good_otp_code(&elements[i]);
         results.push(JsonResult::new(i+1,elements[i].issuer(),elements[i].label(),otp_code))