Merge pull request RustedLessPass#27 from RustedLessPass/Clippy-suggestions

refactor: ♻️ as suggested by clippy

Author: M1n-74316D65

src/app.rs

@@ -175,13 +175,13 @@ impl Component for App {
                         <button
                             style="white-space: nowrap;margin-left: 0rem; padding-left: 0.5rem; padding-right: 0.5rem; align-self: center;"
                             onclick={on_password_click}>
-                            <i class={match self.fingerprint.get(0) { Some(s)=> format!("fa fa-fw {}", s),
+                            <i class={match self.fingerprint.first() { Some(s)=> format!("fa fa-fw {}", s),
                             None => String::new(),
                             }} style="margin-right: 0.2rem;"></i>
                             <i class={match self.fingerprint.get(1) { Some(s)=> format!("fa fa-fw {}", s),
                             None => String::new(),
                             }} style="margin-left: 0.2rem;margin-right: 0.2rem;p"></i>
-                            <i class={match self.fingerprint.get(2) { Some(s)=> format!("fa fa-fw {}", s),
+                            <i class={match self.fingerprint.last() { Some(s)=> format!("fa fa-fw {}", s),
                             None => String::new(),
                             }} style="margin-left: 0.2rem;"></i>
                         </button> // Password fingerprint icons
@@ -190,24 +190,20 @@ impl Component for App {
                         <nav>
 
                         <Switch label="a-z" onchange={settings_callback!(ctx.link(), settings; lowercase)}
-                            value={settings.lowercase.clone()} value_disabled={if self.settings.disabled.clone()=="a-z" { true } else { false
-                            }} /> // Switch for lowercase
+                            value={settings.lowercase} value_disabled={self.settings.disabled.clone() == "a-z"} /> // Switch for lowercase
                         <Switch label="A-Z" onchange={settings_callback!(ctx.link(), settings; uppercase)}
-                            value={settings.uppercase.clone()} value_disabled={if self.settings.disabled.clone()=="A-Z" { true } else { false
-                            }} /> // Switch for uppercase
+                            value={settings.uppercase} value_disabled={self.settings.disabled.clone() == "A-Z"} /> // Switch for uppercase
                         <Switch label="0-9" onchange={settings_callback!(ctx.link(), settings; numbers)}
-                            value={settings.numbers.clone()} value_disabled={if self.settings.disabled.clone()=="0-9" { true } else { false
-                            }} /> // Switch for numbers
+                            value={settings.numbers} value_disabled={self.settings.disabled.clone() == "0-9"} /> // Switch for numbers
                         <Switch label="%!@" onchange={settings_callback!(ctx.link(), settings; symbols)}
-                            value={settings.symbols.clone()} value_disabled={if self.settings.disabled.clone()=="%!@" { true } else { false
-                            }} /> // Switch for symbols
+                            value={settings.symbols} value_disabled={self.settings.disabled.clone() == "%!@"} /> // Switch for symbols
 
                         </nav>
                         <div class="grid" style="padding: 0rem;">
                         <Slider label="Size" max=35 min=1 onchange={settings_callback!(ctx.link(), settings; size)}
-                            value={settings.size.clone()} /> // Slider for password size
+                            value={settings.size} /> // Slider for password size
                         <Slider label="Counter" max=100 min=1 onchange={settings_callback!(ctx.link(), settings; counter)}
-                            value={settings.counter.clone()} /> // Slider for password counter
+                            value={settings.counter} /> // Slider for password counter
                         </div>
 
                     </fieldset>

src/fingerprintgen.rs

@@ -1,5 +1,5 @@
 use lesspass::get_fingerprint;
-
+use std::fmt::Write;
 // Define a constant array of icon names
 const ICONS: [&str; 46] = [
     "fa-hashtag",
@@ -78,8 +78,10 @@ pub fn fingerprint_calculate(input: &str) -> Vec<String> {
         let hashed_input: String = get_fingerprint(input)
             // Convert the byte array to a hexadecimal string
             .iter()
-            .map(|b| format!("{:02x}", b))
-            .collect();
+            .fold(String::new(), |mut acc, &byte| {
+                write!(acc, "{:02x}", byte).expect("Failed to write to string");
+                acc
+            });
 
         // Divide the hashed input into segments and assign icons
         let mut x = 0;

src/passgen.rs

@@ -1,5 +1,17 @@
 use lesspass::{self, CharacterSet};
 
+pub struct PasswordOptions {
+    pub domain: String,
+    pub login: String,
+    pub master_password: String,
+    pub lowercase: bool,
+    pub uppercase: bool,
+    pub digits: bool,
+    pub symbols: bool,
+    pub length: usize,
+    pub counter: u32,
+}
+
 /// Generates a password based on given parameters.
 ///
 /// # Arguments
@@ -17,22 +29,21 @@ use lesspass::{self, CharacterSet};
 /// # Returns
 ///
 /// A string representing the generated password.
-pub fn generate_password(
-    domain: &str,
-    login: &str,
-    master_password: &str,
-    lowercase: bool,
-    uppercase: bool,
-    digits: bool,
-    symbols: bool,
-    length: usize,
-    counter: u32,
-) -> String {
-    let salt = lesspass::generate_salt(domain, login, counter);
-    let entropy =
-        lesspass::generate_entropy(master_password, &salt, lesspass::Algorithm::SHA256, 100000);
-    let charset = generate_charset(lowercase, uppercase, digits, symbols);
-    lesspass::render_password(&entropy, charset, length)
+pub fn generate_password(options: PasswordOptions) -> String {
+    let salt = lesspass::generate_salt(&options.domain, &options.login, options.counter);
+    let entropy = lesspass::generate_entropy(
+        &options.master_password,
+        &salt,
+        lesspass::Algorithm::SHA256,
+        100000,
+    );
+    let charset = generate_charset(
+        options.lowercase,
+        options.uppercase,
+        options.digits,
+        options.symbols,
+    );
+    lesspass::render_password(&entropy, charset, options.length)
 }
 
 /// Generates a character set based on given parameters.

src/password_utils.rs

@@ -1,6 +1,7 @@
 use wasm_bindgen_futures::spawn_local;
 
 use crate::passgen::generate_password;
+use crate::passgen::PasswordOptions;
 use crate::settings::Settings;
 
 // Function to update disabled characters based on settings
@@ -11,7 +12,7 @@ pub fn update_disabled_characters(settings: &Settings) -> String {
         && settings.numbers == 0
         && settings.symbols == 0
     {
-        return "a-z".to_string();
+        "a-z".to_string()
     }
     // Check if only uppercase characters are enabled
     else if settings.lowercase == 0
@@ -57,32 +58,41 @@ pub fn update_show_state(
         // If 'show' is 0
         0 => {
             // Generate new password based on settings
-            let new_password = generate_password(
-                website,
-                username,
-                password,
-                settings.lowercase != 0,
-                settings.uppercase != 0,
-                settings.numbers != 0,
-                settings.symbols != 0,
-                settings.size as usize,
-                settings.counter as u32,
-            );
+            let password_options = PasswordOptions {
+                domain: website.to_string(),
+                login: username.to_string(),
+                master_password: password.to_string(),
+                lowercase: settings.lowercase != 0,
+                uppercase: settings.uppercase != 0,
+                digits: settings.numbers != 0,
+                symbols: settings.symbols != 0,
+                length: settings.size as usize,
+                counter: settings.counter as u32,
+            };
+
+            let new_password = generate_password(password_options);
+
             // Clone the new password for asynchronous use
             let cloned_new_password = new_password.clone();
             // Spawn a local asynchronous task to interact with the clipboard
-            let _task = spawn_local(async move {
+            spawn_local(async move {
                 let window = web_sys::window().expect("window");
                 let nav = window.navigator().clipboard();
-                match nav {
-                    Some(a) => {
-                        let p = a.write_text(&cloned_new_password);
-                        let _result = wasm_bindgen_futures::JsFuture::from(p)
-                            .await
-                            .expect("clipboard populated");
-                    }
-                    None => {}
-                };
+                // match nav {
+                //     Some(a) => {
+                //         let p = a.write_text(&cloned_new_password);
+                //         let _result = wasm_bindgen_futures::JsFuture::from(p)
+                //             .await
+                //             .expect("clipboard populated");
+                //     }
+                //     None => {}
+                // };
+                if let Some(a) = nav {
+                    let p = a.write_text(&cloned_new_password);
+                    let _result = wasm_bindgen_futures::JsFuture::from(p)
+                        .await
+                        .expect("clipboard populated");
+                }
             });
             // Return the updated show state and the new password
             (1, new_password.to_string())

src/switch.rs

@@ -66,7 +66,7 @@ impl Component for Switch {
         // Render the switch component
         html! {
             <label for={id.clone()}>
-                <input type="checkbox" {oninput} role="switch" id={label} name={label} checked={if display_value == 0 { false } else { true }} disabled={value_disabled}/>
+                <input type="checkbox" {oninput} role="switch" id={label} name={label} checked={display_value != 0} disabled={value_disabled}/>
                 {label}
             </label>
         }