swapped jsoncols simple column build for encoding/csv output

Author: rsdoiel

TODO.md

@@ -1,9 +1,11 @@
 
 # Action Items
 
+## Bug
+
+
 ## Next
 
-+ [x] csvcols -col option should not be a boolean, it should take a range like other csv cli
 + [ ] csvrows would output a range of rows (e.g. [2:] would be all rows but the first row)
 + [ ] csv utilities to support integer ranges notation for columns and rows references, E.g. "1,3:4,7,10:" or all
 
@@ -44,15 +46,14 @@
     + strip punctuation
     + rename keys
 + [ ] csvrotate would take a CSV file as import and output columns as rows
-+ [ ] json2csv would convert a 2d JSON array to CSV output, it would comvert a JSON object/map to a column of keys next to a column of values
-    + E.g. `cat data.json | json2csv`
 + [ ] smartcat would function like cat but with support for ranges of lines (e.g. show me last 20 lines: smartcat -start=0 -end="-20" file.txt; cat starting with 10th line: smartcat -start=10 file.txt)
     + [ ] allow prefix line number with a specific delimiter (E.g. comma would let you cat a CSV file adding row numbers as first column)
     + [ ] show lines with prefix, suffix, containing or regxp
     + [ ] show lines without prefix, suffix, containing or regexp
 
 ## Completed
 
++ [x] csvcols -col option should not be a boolean, it should take a range like other csv cli
 + [x] utilities should use starting index of 1 instead of zero as humans refer to column 1 when intending to work on the first column
 + [x] for all cli the -delimiter option should support special characters like \t, \n, \r
 + [x] csvfind would accept CSV input from stdin and output rows with matching column values

cmds/jsoncols/jsoncols.go

@@ -8,13 +8,13 @@
 package main
 
 import (
+	"encoding/csv"
 	"encoding/json"
 	"flag"
 	"fmt"
 	"io/ioutil"
 	"os"
 	"path"
-	"strings"
 
 	// Caltech Library Packages
 	"github.com/caltechlibrary/cli"
@@ -89,7 +89,6 @@ Would yield
 	delimiter      = ","
 	expressions    []string
 	permissive     bool
-	quote          bool
 )
 
 func handleError(err error, exitCode int) {
@@ -119,7 +118,6 @@ func init() {
 	flag.BoolVar(&runInteractive, "r", false, "run interactively")
 	flag.BoolVar(&runInteractive, "repl", false, "run interactively")
 	flag.StringVar(&delimiter, "d", delimiter, "set the delimiter for multi-field output")
-	flag.BoolVar(&quote, "quote", false, "if dilimiter is found in column value add quotes")
 	flag.BoolVar(&permissive, "permissive", false, "suppress error messages")
 	flag.BoolVar(&permissive, "quiet", false, "suppress error messages")
 }
@@ -189,38 +187,37 @@ func main() {
 	}
 
 	// For each dotpath expression return a result
-	for i, qry := range expressions {
-		if i > 0 {
-			fmt.Fprintf(out, "%s", delimiter)
-		}
-		if qry == "." {
-			fmt.Fprintf(out, "%s", buf)
-		} else {
-			result, err := dotpath.Eval(qry, data)
-			if err == nil {
-				switch result.(type) {
-				case string:
-					if quote == true && strings.Contains(result.(string), delimiter) == true {
-						fmt.Fprintf(out, "%q", result)
-					} else {
-						fmt.Fprintf(out, "%s", result)
-					}
-				case json.Number:
-					fmt.Fprintf(out, "%s", result.(json.Number).String())
-				default:
-					src, err := json.Marshal(result)
-					if err != nil {
-						handleError(err, 1)
-					}
-					if quote == true {
-						fmt.Fprintf(out, "%q", src)
-					} else {
-						fmt.Fprintf(out, "%s", src)
-					}
+	row := []string{}
+	for _, qry := range expressions {
+		result, err := dotpath.Eval(qry, data)
+		if err == nil {
+			switch result.(type) {
+			case string:
+				row = append(row, result.(string))
+			case json.Number:
+				row = append(row, result.(json.Number).String())
+			default:
+				src, err := json.Marshal(result)
+				if err != nil {
+					handleError(err, 1)
 				}
-			} else {
-				handleError(err, 1)
+				row = append(row, fmt.Sprintf("%s", src))
 			}
+		} else {
+			handleError(err, 1)
 		}
 	}
+
+	// Setup the CSV output
+	w := csv.NewWriter(out)
+	if delimiter != "" {
+		w.Comma = datatools.NormalizeDelimiterRune(delimiter)
+	}
+	if err := w.Write(row); err != nil {
+		handleError(err, 1)
+	}
+	w.Flush()
+	if err := w.Error(); err != nil {
+		handleError(err, 1)
+	}
 }