Replaced words.rs with password_generator.rs

cursive/src/main.rs

@@ -42,6 +42,8 @@ use ripasso::{
     pass::{
         OwnerTrustLevel, PasswordStore, Recipient, SignatureStatus, all_recipients_from_stores,
     },
+    passphrase_generator::passphrase_generator,
+    password_generator::password_generator,
 };
 use unic_langid::LanguageIdentifier;
 
@@ -442,8 +444,23 @@ fn open(ui: &mut Cursive, store: PasswordStoreType) -> Result<()> {
             new_secret.zeroize();
 
         })
-        .button(CATALOG.gettext("Generate"), move |s| {
-            let mut new_password = ripasso::words::generate_password(6);
+        .button(CATALOG.gettext("Generate Password"), move |s| {
+            let mut new_password = password_generator(20, 0);
+            s.call_on_name("editbox", |e: &mut TextArea| {
+                e.set_content(&new_password);
+            });
+            new_password.zeroize()
+        })
+
+
+        .button(CATALOG.gettext("Generate Passphrase"), move |s| {
+            let mut new_password = match passphrase_generator(6) {
+                Ok(words) => words.join(" "),
+                Err(err) => {
+                    helpers::errorbox(s, &ripasso::pass::Error::from(err));
+                    return;
+                }
+            };
             s.call_on_name("editbox", |e: &mut TextArea| {
                 e.set_content(&new_password);
             });
@@ -694,8 +711,20 @@ fn create(ui: &mut Cursive, store: PasswordStoreType) {
 
     let d = Dialog::around(fields)
         .title(CATALOG.gettext("Add new password"))
-        .button(CATALOG.gettext("Generate"), move |s| {
-            let new_password = ripasso::words::generate_password(6);
+        .button(CATALOG.gettext("Generate Password"), move |s| {
+            let new_password = ripasso::password_generator::password_generator(20, 0);
+            s.call_on_name("new_password_input", |e: &mut EditView| {
+                e.set_content(new_password);
+            });
+        })
+        .button(CATALOG.gettext("Generate Passphrase"), move |s| {
+            let new_password = match ripasso::passphrase_generator::passphrase_generator(6) {
+                Ok(words) => words.join(" "),
+                Err(err) => {
+                    helpers::errorbox(s, &ripasso::pass::Error::from(err));
+                    return;
+                }
+            };
             s.call_on_name("new_password_input", |e: &mut EditView| {
                 e.set_content(new_password);
             });