From 122aeaf75b597c9fd5fd19b5989bd762a863ede7 Mon Sep 17 00:00:00 2001
From: Oleksandr Kozachuk <ddeus.lp@mailnull.com>
Date: Sat, 7 Jan 2023 13:40:00 +0100
Subject: [PATCH] Refactor read_password function to take just the name as
 argument, not the prompt.

---
 hel/src/commands.rs | 8 ++++----
 hel/src/repl.rs     | 6 +-----
 hel/src/structs.rs  | 4 ++--
 hel/src/utils.rs    | 4 ++--
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/hel/src/commands.rs b/hel/src/commands.rs
index 0c11afb..04a8a0d 100644
--- a/hel/src/commands.rs
+++ b/hel/src/commands.rs
@@ -46,7 +46,7 @@ impl<'a> LKEval<'a> {
             (_, Some(s)) => Some(s.to_string()),
             (None, None) => {
                 if read {
-                    match (self.read_password)("Master: ".to_string()) {
+                    match (self.read_password)("/".to_string()) {
                         Ok(password) => {
                             let name = "/".to_string();
                             self.cmd_correct(&out, &name, true, Some(password.clone()));
@@ -61,7 +61,7 @@ impl<'a> LKEval<'a> {
             }
             (Some(pn), None) => {
                 let password = if read {
-                    (self.read_password)(format!("Password for {}: ", pn.lock().borrow().name)).ok()
+                    (self.read_password)(pn.lock().borrow().name.to_string()).ok()
                 } else {
                     None
                 };
@@ -139,7 +139,7 @@ impl<'a> LKEval<'a> {
             Some(p) => {
                 let pwd = match pass {
                     Some(pp) => pp.to_string(),
-                    None => (self.read_password)(format!("Password for {}: ", p.lock().borrow().name)).unwrap(),
+                    None => (self.read_password)(p.lock().borrow().name.to_string()).unwrap(),
                 };
                 self.cmd_correct(&out, &p.lock().borrow().name, true, Some(pwd.clone()));
                 self.state.lock().borrow_mut().secrets.insert(p.lock().borrow().name.to_string(), pwd);
@@ -148,7 +148,7 @@ impl<'a> LKEval<'a> {
                 if name == "/" {
                     let pwd = match pass {
                         Some(pp) => pp.to_string(),
-                        None => (self.read_password)("Master: ".to_string()).unwrap(),
+                        None => (self.read_password)("/".to_string()).unwrap(),
                     };
                     self.cmd_correct(&out, &"/".to_string(), true, Some(pwd.clone()));
                     self.state.lock().borrow_mut().secrets.insert("/".to_string(), pwd);
diff --git a/hel/src/repl.rs b/hel/src/repl.rs
index bf8b4cd..fde4d29 100644
--- a/hel/src/repl.rs
+++ b/hel/src/repl.rs
@@ -320,22 +320,18 @@ mod tests {
             Date::new(2022, 12, 30),
             None,
         ));
-        println!("POINT 1");
         assert_eq!(
             LKEval::news(Command::Add(t1.clone()), lk.clone()).eval(),
             LKPrint::new(LKOut::from_vecs(vec![], vec![]), false, lk.clone())
         );
-        println!("POINT 2");
         assert_eq!(
             LKEval::news(Command::Add(t2.clone()), lk.clone()).eval(),
             LKPrint::new(LKOut::from_vecs(vec![], vec![]), false, lk.clone())
         );
-        println!("POINT 3");
         assert_eq!(
             LKEval::news(Command::Add(t3.clone()), lk.clone()).eval(),
             LKPrint::new(LKOut::from_vecs(vec![], vec![]), false, lk.clone())
         );
-        println!("POINT 4");
         assert_eq!(
             LKEval::news(Command::Mv("t3".to_string(), "t2".to_string()), lk.clone()).eval(),
             LKPrint::new(LKOut::from_vecs(vec![], vec![]), false, lk.clone())
@@ -358,7 +354,7 @@ mod tests {
             )
         );
         assert_eq!(
-            LKEval::newd(Command::Enc("t3".to_string()), lk.clone(), |p| if p == "Master: " {
+            LKEval::newd(Command::Enc("t3".to_string()), lk.clone(), |p| if p == "/" {
                 Ok("a".to_string())
             } else {
                 Err(std::io::Error::new(std::io::ErrorKind::NotFound, "test"))
diff --git a/hel/src/structs.rs b/hel/src/structs.rs
index c3b770c..f87d3fa 100644
--- a/hel/src/structs.rs
+++ b/hel/src/structs.rs
@@ -493,7 +493,7 @@ mod tests {
         assert_eq!(
             pr.out,
             LKOut::from_vecs(
-                vec!["fief gild sits can un very".to_string()],
+                vec!["san bud most noon jaw cash".to_string()],
                 vec![
                     "warning: password / is not marked as correct".to_string(),
                     "warning: password t1 is not marked as correct".to_string(),
@@ -523,6 +523,6 @@ mod tests {
                 ]
             )
         );
-        assert_eq!(std::fs::read_to_string("test_pb_out").expect("read"), "fief gild sits can un very");
+        assert_eq!(std::fs::read_to_string("test_pb_out").expect("read"), "san bud most noon jaw cash");
     }
 }
diff --git a/hel/src/utils.rs b/hel/src/utils.rs
index 555b8f7..c002648 100644
--- a/hel/src/utils.rs
+++ b/hel/src/utils.rs
@@ -139,8 +139,8 @@ pub mod editor {
         }
     }
 
-    pub fn password(prompt: impl ToString) -> std::io::Result<String> {
-        rpassword::prompt_password(prompt)
+    pub fn password(pwname: String) -> std::io::Result<String> {
+        rpassword::prompt_password(format!("Password for {}: ", pwname))
     }
 }