lockbox

commit ca1cddcd863e794152bf0e122f1e41e5afcf60dc
parent 6fddc898fbc48c3fdb069e831f4c008aff562aeb
Author: Sean Enck <sean@ttypty.com>
Date:   Thu,  1 Aug 2024 18:48:15 -0400

exit earlier if no entities match on a remove request

Diffstat:
M
internal/app/remove.go
 | 
3
+++
M
internal/app/remove_test.go
 | 
4
++--
M
tests/expected.log
 | 
2
+-

3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/internal/app/remove.go b/internal/app/remove.go
@@ -19,6 +19,9 @@ func Remove(cmd CommandOptions) error {
 	if err != nil {
 		return err
 	}
+	if len(existings) == 0 {
+		return fmt.Errorf("no entities matching: %s", deleting)
+	}
 	w := cmd.Writer()
 	if len(existings) > 1 {
 		postfixRemove = "ies"
diff --git a/internal/app/remove_test.go b/internal/app/remove_test.go
@@ -19,10 +19,10 @@ func TestRemove(t *testing.T) {
 	}
 	m.confirmed = false
 	m.args = []string{"tzzzest/test2/test1"}
-	if err := app.Remove(m); err.Error() != "unable to remove: no entities given" {
+	if err := app.Remove(m); err.Error() != "no entities matching: tzzzest/test2/test1" {
 		t.Errorf("invalid error: %v", err)
 	}
-	if !m.confirmed {
+	if m.confirmed {
 		t.Error("no remove")
 	}
 	m.confirmed = false
diff --git a/tests/expected.log b/tests/expected.log
@@ -60,7 +60,7 @@ XXXXXX
 }
 delete entry? (y/N) 
 delete entry? (y/N) 
-delete entry? (y/N) unable to remove: no entities given
+no entities matching: test/k/one
 
 
 multiple moves can only be done at a leaf level