From 8f43ad2a357373e7dc5079222a2f49b58eb632cf Mon Sep 17 00:00:00 2001 From: Alexey Khit Date: Fri, 16 Sep 2022 17:35:41 +0300 Subject: [PATCH] Adds pretty print to info --- cmd/api/api.go | 10 +++------- cmd/homekit/api.go | 10 +--------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/cmd/api/api.go b/cmd/api/api.go index 9f0be64a..e67ec7b3 100644 --- a/cmd/api/api.go +++ b/cmd/api/api.go @@ -102,13 +102,9 @@ func streamsHandler(w http.ResponseWriter, r *http.Request) { v = streams.All() } - data, err := json.Marshal(v) - if err != nil { - log.Error().Err(err).Msg("[api.streams] marshal") - return - } - - _, _ = w.Write(data) + e := json.NewEncoder(w) + e.SetIndent("", " ") + _ = e.Encode(v) } func apiWS(w http.ResponseWriter, r *http.Request) { diff --git a/cmd/homekit/api.go b/cmd/homekit/api.go index f21c7d3d..0c74b3b8 100644 --- a/cmd/homekit/api.go +++ b/cmd/homekit/api.go @@ -54,15 +54,7 @@ func apiHandler(w http.ResponseWriter, r *http.Request) { items = append(items, device) } - data, err := json.Marshal(items) - if err != nil { - log.Error().Err(err).Msg("[api.homekit]") - return - } - - if _, err = w.Write(data); err != nil { - log.Error().Err(err).Msg("[api.homekit]") - } + _= json.NewEncoder(w).Encode(items) case "POST": // TODO: post params...