From fb89fb7b31de3cba83d4fd7e7bd295211247ac95 Mon Sep 17 00:00:00 2001
From: James Houlahan <james.houlahan@protonmail.com>
Date: Mon, 15 Feb 2021 11:12:36 +0100
Subject: [PATCH] Other: pretty print prefs.json

---
 internal/config/settings/kvs.go      | 6 +++---
 internal/config/settings/kvs_test.go | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/internal/config/settings/kvs.go b/internal/config/settings/kvs.go
index 2be45b42..f40cd1a8 100644
--- a/internal/config/settings/kvs.go
+++ b/internal/config/settings/kvs.go
@@ -21,6 +21,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"strconv"
 	"sync"
@@ -73,13 +74,12 @@ func (p *keyValueStore) save() error {
 	p.lock.Lock()
 	defer p.lock.Unlock()
 
-	f, err := os.Create(p.path)
+	b, err := json.MarshalIndent(p.cache, "", "\t")
 	if err != nil {
 		return err
 	}
-	defer f.Close() //nolint[errcheck]
 
-	return json.NewEncoder(f).Encode(p.cache)
+	return ioutil.WriteFile(p.path, b, 0600)
 }
 
 func (p *keyValueStore) setDefault(key, value string) {
diff --git a/internal/config/settings/kvs_test.go b/internal/config/settings/kvs_test.go
index cca938b3..3a68a42a 100644
--- a/internal/config/settings/kvs_test.go
+++ b/internal/config/settings/kvs_test.go
@@ -72,20 +72,20 @@ func TestKeyValueStoreSetDefault(t *testing.T) {
 func TestKeyValueStoreSet(t *testing.T) {
 	pref := newTestEmptyKeyValueStore(t)
 	pref.Set("str", "value")
-	checkSavedKeyValueStore(t, "{\"str\":\"value\"}")
+	checkSavedKeyValueStore(t, "{\n\t\"str\": \"value\"\n}")
 }
 
 func TestKeyValueStoreSetInt(t *testing.T) {
 	pref := newTestEmptyKeyValueStore(t)
 	pref.SetInt("int", 42)
-	checkSavedKeyValueStore(t, "{\"int\":\"42\"}")
+	checkSavedKeyValueStore(t, "{\n\t\"int\": \"42\"\n}")
 }
 
 func TestKeyValueStoreSetBool(t *testing.T) {
 	pref := newTestEmptyKeyValueStore(t)
 	pref.SetBool("trueBool", true)
 	pref.SetBool("falseBool", false)
-	checkSavedKeyValueStore(t, "{\"falseBool\":\"false\",\"trueBool\":\"true\"}")
+	checkSavedKeyValueStore(t, "{\n\t\"falseBool\": \"false\",\n\t\"trueBool\": \"true\"\n}")
 }
 
 func newTestEmptyKeyValueStore(t *testing.T) *keyValueStore {
@@ -101,5 +101,5 @@ func newTestKeyValueStore(t *testing.T) *keyValueStore {
 func checkSavedKeyValueStore(t *testing.T, expected string) {
 	data, err := ioutil.ReadFile(testPrefFilePath)
 	require.NoError(t, err)
-	require.Equal(t, expected+"\n", string(data))
+	require.Equal(t, expected, string(data))
 }