update codes.

Author: foolin

cmd/config.go

@@ -2,6 +2,6 @@ package cmd
 
 type Config struct {
 	Verbose bool   `json:"verbose"`
-	Format  string `json:"format"` //Format: table/json/csv/yaml2
-	Output  string `json:"output"` //Output write file
+	Type    string `json:"type"`   //Type: table/json/csv/yaml
+	Output  string `json:"output"` //Output file
 }

cmd/root.go

@@ -22,15 +22,17 @@ THE SOFTWARE.
 package cmd
 
 import (
+	"fmt"
+	"os"
+	"path/filepath"
+
 	"github.com/foolin/sumdiff/internal/util"
 	"github.com/foolin/sumdiff/internal/vlog"
 	"github.com/foolin/sumdiff/internal/write"
 	"github.com/spf13/cobra"
-	"os"
-	"path/filepath"
 )
 
-var config Config
+var config *Config
 var writer *write.Writer
 var file *os.File
 
@@ -43,18 +45,21 @@ var rootCmd = &cobra.Command{
 	// has an action associated with it:
 	// Run: func(cmd *cobra.Command, args []string) { },
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
+
+		fmt.Printf("Config: %#v", config)
 		//Verbose
 		vlog.SetVerbose(config.Verbose)
 
 		//Write
 		t := write.Table
-		if config.Format != "" {
+		if config.Type != "" {
 			var ok bool
-			t, ok = write.TypeOfName(config.Format)
+			t, ok = write.TypeOfName(config.Type)
 			if !ok {
-				vlog.Exit(1, "Format invalid: %v\n", config.Format)
+				vlog.Exit(1, "Format invalid: %v\n", config.Type)
 				return
 			}
+			fmt.Printf("Parse type: %v\n", t)
 		}
 
 		w := os.Stdout
@@ -98,14 +103,14 @@ func init() {
 	// Cobra supports persistent flags, which, if defined here,
 	// will be global for your application.
 
-	config = Config{
+	config = &Config{
 		Verbose: false,
-		Format:  "",
+		Type:    "table",
 		Output:  "",
 	}
 	// rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.sumdiff.yaml)")
 	rootCmd.PersistentFlags().BoolVarP(&config.Verbose, "verbose", "v", false, "Verbose output info")
-	rootCmd.PersistentFlags().StringVarP(&config.Format, "format", "f", "table", "Format: table|json|csv|yaml")
+	rootCmd.PersistentFlags().StringVarP(&config.Type, "type", "t", "table", "Format: table|json|csv|yaml")
 	rootCmd.PersistentFlags().StringVarP(&config.Output, "output", "o", "", "Output filename")
 
 	// Cobra also supports local flags, which will only run

internal/write/type_test.go

@@ -0,0 +1,11 @@
+package write
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestTypeOfName(t *testing.T) {
+	typ, ok := TypeOfName("json")
+	fmt.Printf("%v %v", typ, ok)
+}

internal/write/writer.go

@@ -4,15 +4,16 @@ import (
 	"encoding/csv"
 	"encoding/json"
 	"fmt"
-	"github.com/liushuochen/gotable"
-	"gopkg.in/yaml.v3"
 	"io"
 	"os"
+
+	"github.com/liushuochen/gotable"
+	"gopkg.in/yaml.v3"
 )
 
 type Writer struct {
-	w io.Writer
-	t Type
+	writer io.Writer
+	typ    Type
 }
 
 type TableData interface {
@@ -21,8 +22,8 @@ type TableData interface {
 
 func New(w io.Writer, t Type) *Writer {
 	return &Writer{
-		w: w,
-		t: t,
+		writer: w,
+		typ:    t,
 	}
 }
 
@@ -31,7 +32,8 @@ func NewStd() *Writer {
 }
 
 func (r *Writer) Write(data TableData) error {
-	switch r.t {
+	fmt.Printf("type: %v\n", r.typ)
+	switch r.typ {
 	case Table:
 		return r.Table(data.Array())
 	case Csv:
@@ -57,7 +59,7 @@ func (r *Writer) MustWrite(data TableData) {
 }
 
 func (r *Writer) Printf(s string, a ...any) (n int, err error) {
-	return r.w.Write([]byte(fmt.Sprintf(s, a...)))
+	return r.writer.Write([]byte(fmt.Sprintf(s, a...)))
 }
 
 func (r *Writer) Table(records [][]string) error {
@@ -85,7 +87,7 @@ func (r *Writer) Table(records [][]string) error {
 }
 
 func (r *Writer) Csv(records [][]string) error {
-	writer := csv.NewWriter(r.w)
+	writer := csv.NewWriter(r.writer)
 	return writer.WriteAll(records)
 }