add unit test, json indentation, rename json obj vars

Author: Thomas von Dein

lib/printer.go

@@ -295,32 +295,31 @@ func printShellData(writer io.Writer, data *Tabdata) {
 }
 
 func printJsonData(writer io.Writer, data *Tabdata) {
-	hashlist := make([]map[string]any, len(data.entries))
+	objlist := make([]map[string]any, len(data.entries))
 
 	if len(data.entries) > 0 {
 		for i, entry := range data.entries {
-			hash := make(map[string]any, len(entry))
+			obj := make(map[string]any, len(entry))
 
 			for idx, value := range entry {
 				num, err := strconv.Atoi(value)
 				if err == nil {
-					hash[data.headers[idx]] = num
+					obj[data.headers[idx]] = num
 				} else {
-					hash[data.headers[idx]] = value
+					obj[data.headers[idx]] = value
 				}
 			}
 
-			hashlist[i] = hash
+			objlist[i] = obj
 		}
 	}
 
-	jsonstr, err := json.Marshal(&hashlist)
+	jsonstr, err := json.MarshalIndent(&objlist, "", "  ")
 
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	//repr.Println(jsonstr)
 	output(writer, string(jsonstr))
 }
 

lib/printer_test.go

@@ -125,6 +125,31 @@ ceta,33d12h,9,06/Jan/2008 15:04:05 -0700`,
 NAME="beta" DURATION="1d10h5m1s" COUNT="33" WHEN="3/1/2014"
 NAME="alpha" DURATION="4h35m" COUNT="170" WHEN="2013-Feb-03"
 NAME="ceta" DURATION="33d12h" COUNT="9" WHEN="06/Jan/2008 15:04:05 -0700"`,
+	},
+	{
+		name:      "json",
+		mode:      cfg.Json,
+		numberize: false,
+		expect: `[
+  {
+    "COUNT": 33,
+    "DURATION": "1d10h5m1s",
+    "NAME": "beta",
+    "WHEN": "3/1/2014"
+  },
+  {
+    "COUNT": 170,
+    "DURATION": "4h35m",
+    "NAME": "alpha",
+    "WHEN": "2013-Feb-03"
+  },
+  {
+    "COUNT": 9,
+    "DURATION": "33d12h",
+    "NAME": "ceta",
+    "WHEN": "06/Jan/2008 15:04:05 -0700"
+  }
+]`,
 	},
 	{
 		name:      "yaml",