Custom progress bar width

Author: replydev

src/main.rs

@@ -4,6 +4,7 @@ mod argument_functions;
 mod cryptograpy;
 mod importers;
 mod otp;
+mod print_settings;
 use std::env;
 use sodiumoxide;
 use std::thread::sleep;
@@ -95,8 +96,8 @@ fn dashboard(){
             else{
                 init_ctrlc_handler(elements.len());
                 loop{
-                    utils::print_progress_bar();
-                    otp_helper::show_codes(&elements);
+                    let width = otp_helper::show_codes(&elements);
+                    utils::print_progress_bar(width as u64);
                     sleep(Duration::from_millis(2000));
                     utils::clear_lines(elements.len() * 2 + 4,false);
                 }

src/otp/otp_helper.rs

@@ -5,6 +5,7 @@ use crate::{cryptograpy, database_loader};
 use crate::otp::otp_element::OTPElement;
 use crate::otp::otp_maker::make_totp;
 use crate::utils::check_elements;
+use crate::print_settings::PrintSettings;
 
 
 #[derive(Serialize, Deserialize)]
@@ -33,17 +34,31 @@ pub fn read_codes() -> Result<Vec<OTPElement>,String>{
     }
 }
 
-pub fn show_codes(elements: &Vec<OTPElement>){
+pub fn show_codes(elements: &Vec<OTPElement>) -> usize{
+    let mut print_settings = PrintSettings::new();
     let mut table = Table::new();
     table.add_row(row!["Id","Issuer","Label","Code"]);
     for i in 0..elements.len() {
-        add_element_to_table(i, &mut table, &elements[i]);
+        add_element_to_table(i, &mut table, &elements[i],&mut print_settings);
     }
     table.printstd();
+    print_settings.get_width()
 }
 
-fn add_element_to_table(i: usize, table: &mut Table,element: &OTPElement){
-    table.add_row(row![i+1,element.issuer(),element.label(),get_good_otp_code(&element)]);
+fn add_element_to_table(i: usize, table: &mut Table,element: &OTPElement,print_settings: &mut PrintSettings){
+    let index = (i+1).to_string();
+    let issuer = element.issuer();
+    let label = element.label();
+    let code = get_good_otp_code(&element);
+    table.add_row(row![index,issuer,label,code]);
+
+    let mut temp_print = PrintSettings::new();
+    temp_print.set_max_id(index.len());
+    temp_print.set_max_issuer(issuer.len());
+    temp_print.set_max_label(label.len());
+    temp_print.set_max_code(code.len());
+
+    print_settings.check_other(&temp_print);
 }
 
 fn get_good_otp_code(element: &OTPElement) -> String {

src/print_settings.rs

@@ -0,0 +1,73 @@
+pub struct PrintSettings {
+    max_id: usize,
+    max_issuer: usize,
+    max_label: usize,
+    max_code: usize,
+}
+
+impl PrintSettings {
+    pub fn new() -> PrintSettings{
+        // set the length of id, issuer, label, and code words
+        PrintSettings {
+            max_id: 2,
+            max_issuer: 6,
+            max_label: 5,
+            max_code: 4,
+        }
+    }
+
+    pub fn set_max_id(&mut self, id: usize) -> &mut PrintSettings{
+        self.max_id = id;
+        self
+    }
+
+    pub fn get_max_id(&self) -> usize {
+        self.max_id
+    }
+
+    pub fn set_max_issuer(&mut self, max_issuer: usize) -> &mut PrintSettings{
+        self.max_issuer = max_issuer;
+        self
+    }
+
+    pub fn get_max_issuer(&self) -> usize {
+        self.max_issuer
+    }
+
+    pub fn set_max_label(&mut self, max_label: usize) -> &mut PrintSettings{
+        self.max_label = max_label;
+        self
+    }
+
+    pub fn get_max_label(&self) -> usize {
+        self.max_label
+    }
+
+    pub fn set_max_code(&mut self, max_code: usize) -> &mut PrintSettings{
+        self.max_code = max_code;
+        self
+    }
+
+    pub fn get_max_code(&self) -> usize {
+        self.max_code
+    }
+
+    pub fn check_other(&mut self,other: &PrintSettings){
+        if other.get_max_id() > self.get_max_id() {
+            self.set_max_id(other.get_max_id());
+        }
+        if other.get_max_issuer() > self.get_max_issuer() {
+            self.set_max_issuer(other.get_max_issuer());
+        }
+        if other.get_max_label() > self.get_max_label() {
+            self.set_max_label(other.get_max_label());
+        }
+        if other.get_max_code() > self.get_max_code() {
+            self.set_max_code(other.get_max_code());
+        }
+    }
+
+    pub fn get_width(&self) -> usize {
+        self.max_id + 2 + self.max_issuer + 2 + self.max_label + 2 + self.max_code + 2 + 3
+    }
+}

src/utils.rs

@@ -19,13 +19,28 @@ pub fn get_db_path() -> PathBuf{
 pub fn get_home_folder() -> PathBuf {
     home_dir().unwrap()
 }
+
 // Push an absolute path to a PathBuf replaces the entire PathBuf: https://doc.rust-lang.org/std/path/struct.PathBuf.html#method.push
+#[cfg(not(debug_assertions))]
 fn get_cotp_folder() -> PathBuf{
     let mut cotp_dir = PathBuf::new();
     cotp_dir.push(get_home_folder());
     cotp_dir.join(".cotp")
 }
 
+#[cfg(debug_assertions)]
+pub fn create_db_if_needed() -> Result<bool,()>{
+    let db_path = get_db_path();
+    if !db_path.exists() {
+        match std::fs::File::create(db_path){
+            Ok(_f) => return Ok(true),
+            Err(_e) => return Err(()),
+        }
+    }
+    Ok(false)
+}
+
+#[cfg(not(debug_assertions))]
 pub fn create_db_if_needed() -> Result<bool,()>{
     let cotp_folder = get_cotp_folder();
     if !cotp_folder.exists(){
@@ -49,14 +64,14 @@ pub fn write_to_file(content: &str, file: &mut File) -> Result<(),std::io::Error
     file.sync_all()
 }
 
-pub fn print_progress_bar(){
-    let width = 60;
+pub fn print_progress_bar(width: u64){
     let now = SystemTime::now();
     let since_the_epoch = now.duration_since(UNIX_EPOCH).unwrap();
     let in_ms = since_the_epoch.as_secs() * 1000 + since_the_epoch.subsec_nanos() as u64 / 1000000;
     let step = in_ms % 30000;
     let idx = step * width / 30000;
-    println!("[{:60}]", "=".repeat(idx as usize));
+    //println!("[{progress:>w$}]",  progress="=".repeat(idx as usize),w=width as usize,);
+    println!("[{progress:<w$}]",  progress="=".repeat(idx as usize),w=width as usize,);
 }
 
 pub fn clear_lines(lines: usize,exit: bool){