Clear interface on exit

Author: replydev

Cargo.toml

@@ -23,3 +23,4 @@ ascii = "1.0"
 data-encoding = "2.3.1"
 err-derive = "0.3.0"
 ring = "0.16.19"
+ctrlc = "3.1.7"

src/main.rs

@@ -1,14 +1,15 @@
-use std::env;
 mod database_loader;
 mod utils;
 mod argument_functions;
 mod otp_helper;
 mod cryptograpy;
 mod importers;
 mod otp;
+use std::env;
 use sodiumoxide;
 use std::thread::sleep;
 use std::time::Duration;
+use ctrlc;
 
 const VERSION: &str = "0.1.3";
 
@@ -25,6 +26,22 @@ fn print_title(){
     println!("written by @replydev\n");
 }
 
+#[cfg(debug_assertions)]
+fn init_ctrlc_handler(lines: usize){
+    ctrlc::set_handler(move || {
+        utils::clear_lines(lines + 7);
+        std::process::exit(0);
+    }).expect("Failed to initialize ctrl-c handler");
+}
+
+#[cfg(not(debug_assertions))]
+fn init_ctrlc_handler(lines: usize){
+    ctrlc::set_handler(move || {
+        utils::clear_lines(lines + 6);
+        std::process::exit(0);
+    }).expect("Failed to initialize ctrl-c handler");
+}
+
 fn init() -> Result<(), String>{
     match sodiumoxide::init(){
         Err(()) => {
@@ -65,22 +82,22 @@ fn main() {
 }
 
 fn dashboard(){
-    let mut lines;
     match otp_helper::read_codes(){
         Ok(elements) => {
             if elements.len() == 0{
                 println!("No codes, type \"cotp -h\" to get help");
             }
             else{
+                init_ctrlc_handler(elements.len());
                 loop{
                     utils::print_progress_bar();
-                    lines = otp_helper::show_codes(&elements);
+                    otp_helper::show_codes(&elements);
                     sleep(Duration::from_millis(1000));
-                    print!("\x1B[{}A", lines + 1);
+                    utils::clear_lines(elements.len() + 1);
                 }
             }
         },
-        Err(e) => println!("An error occurred: {}",e),
+        Err(e) => eprintln!("An error occurred: {}",e),
     }
 }
 

src/otp_helper.rs

@@ -29,12 +29,10 @@ pub fn read_codes() -> Result<Vec<database_loader::OTPElement>,String>{
     }
 }
 
-pub fn show_codes(elements: &Vec<database_loader::OTPElement>) -> usize{
-    //let elements;
+pub fn show_codes(elements: &Vec<database_loader::OTPElement>){
     for i in 0..elements.len() {
         print_totp(i,&elements[i]);
     }
-    elements.len()
 }
 
 fn print_totp(i: usize,element: &database_loader::OTPElement){

src/utils.rs

@@ -58,6 +58,11 @@ pub fn print_progress_bar(){
     println!("[{:60}]", "=".repeat(idx as usize));
 }
 
+pub fn clear_lines(lines: usize){
+    // \x1B[{}A does not work during ctrl clear
+    print!("\x1B[{}A\x1B[0G\x1B[0J", lines);
+}
+
 #[cfg(test)]
 mod tests{
     use super::create_db_if_needed;