lockbox

commit c028ac694d8978f69a4a2fd2554e2f92c5754b6e
parent 2ab90802dd7820ff37da3205654ae6524ca655c9
Author: Sean Enck <sean@ttypty.com>
Date:   Fri, 31 Mar 2023 18:34:23 -0400

cleanup json output

Diffstat:
M
internal/app/conv.go
 | 
10
+++++++---
M
internal/app/json_test.go
 | 
2
+-

2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/internal/app/conv.go b/internal/app/conv.go
@@ -34,7 +34,7 @@ func serialize(w io.Writer, tx *backend.Transaction, filter string) error {
 	if err != nil {
 		return err
 	}
-	fmt.Fprint(w, "{\n")
+	fmt.Fprint(w, "{")
 	hasFilter := len(filter) > 0
 	printed := false
 	for _, item := range e {
@@ -44,8 +44,9 @@ func serialize(w io.Writer, tx *backend.Transaction, filter string) error {
 			}
 		}
 		if printed {
-			fmt.Fprintf(w, ",\n")
+			fmt.Fprint(w, ",")
 		}
+		fmt.Fprint(w, "\n")
 		b, err := json.MarshalIndent(map[string]json.RawMessage{item.Path: json.RawMessage([]byte(item.Value))}, "", "  ")
 		if err != nil {
 			return err
@@ -56,6 +57,9 @@ func serialize(w io.Writer, tx *backend.Transaction, filter string) error {
 		fmt.Fprintf(w, "  %s", strings.TrimSpace(trimmed))
 		printed = true
 	}
-	fmt.Fprintf(w, "\n}\n")
+	if printed {
+		fmt.Fprint(w, "\n")
+	}
+	fmt.Fprint(w, "}\n")
 	return nil
 }
diff --git a/internal/app/json_test.go b/internal/app/json_test.go
@@ -28,7 +28,7 @@ func TestJSON(t *testing.T) {
 	if err := app.JSON(m); err != nil {
 		t.Errorf("invalid error: %v", err)
 	}
-	if m.buf.String() == "" {
+	if m.buf.String() != "{}\n" {
 		t.Error("no data")
 	}
 }