foolin/feat-write

Makefile

@@ -2,7 +2,7 @@ install:
 
 build:
 	mkdir -p ./bin
-	go build -o ./bin/sumdiff ./cli/sumdiff.go
+	go build -o ./bin/sumdiff ./cli/main.go
 
 install: build
 	sudo rm -rf ~/go/bin/sumdiff

README.md

@@ -177,6 +177,6 @@ tar -xvf sumdiff_Linux_x86_64.tar.gz && sudo mv sumdiff /usr/local/bin
 ```
 
 ## TODO
-[ ] Output table,csv,yaml,json
-[ ] Config display statusbar
-[ ] Write file
+- [ ] Output table,csv,yaml,json  
+- [ ] Config display statusbar  
+- [ ] Write file or console

cmd/cmp.go

@@ -23,13 +23,14 @@ package cmd
 
 import (
 	"github.com/foolin/sumdiff"
-	"github.com/foolin/sumdiff/internal/plog"
 	"github.com/foolin/sumdiff/internal/statusbar"
 	"github.com/foolin/sumdiff/vo"
 
 	"github.com/spf13/cobra"
 )
 
+var detail bool
+
 // cmpCmd represents the cmp command
 var cmpCmd = &cobra.Command{
 	Use:   "cmp",
@@ -40,10 +41,14 @@ var cmpCmd = &cobra.Command{
 		ok, list, err := sumdiff.Cmp(args[0], args[1])
 		statusbar.Stop()
 		if err != nil {
-			plog.Println("Happen error:", err)
+			writer.MustWrite(vo.NewErrInfo(err))
+			return
+		}
+		if detail {
+			writer.MustWrite(list)
+		} else {
+			writer.MustWrite(vo.NewAny("result", ok))
 		}
-		plog.WriteTable(vo.CmpToLiteTable(list))
-		plog.Println("result:", ok)
 	},
 }
 
@@ -54,7 +59,7 @@ func init() {
 
 	// Cobra supports Persistent Flags which will work for this command
 	// and all subcommands, e.g.:
-	// cmpCmd.PersistentFlags().String("foo", "", "A help for foo")
+	cmpCmd.PersistentFlags().BoolVarP(&detail, "detail", "", false, "Show detail result")
 
 	// Cobra supports local flags which will only run when this command
 	// is called directly, e.g.:

cmd/config.go

@@ -0,0 +1,7 @@
+package cmd
+
+type Config struct {
+	Verbose bool   `json:"verbose"`
+	Format  string `json:"format"` //Format: table/json/csv/yaml
+	Output  string `json:"output"` //Output file
+}

cmd/eq.go

@@ -23,8 +23,8 @@ package cmd
 
 import (
 	"github.com/foolin/sumdiff"
-	"github.com/foolin/sumdiff/internal/plog"
 	"github.com/foolin/sumdiff/internal/statusbar"
+	"github.com/foolin/sumdiff/vo"
 	"github.com/spf13/cobra"
 )
 
@@ -39,9 +39,10 @@ var eqCmd = &cobra.Command{
 		ret, err := sumdiff.Equal(args[0], args[1])
 		statusbar.Stop()
 		if err != nil {
-			plog.Println(err.Error())
+			writer.MustWrite(vo.NewErrInfo(err))
+			return
 		}
-		plog.Writeln(ret)
+		writer.MustWrite(vo.NewAny("result", ret))
 	},
 }
 

cmd/hash.go

@@ -23,7 +23,6 @@ package cmd
 
 import (
 	"github.com/foolin/sumdiff"
-	"github.com/foolin/sumdiff/internal/plog"
 	"github.com/foolin/sumdiff/internal/statusbar"
 	"github.com/foolin/sumdiff/vo"
 	"github.com/spf13/cobra"
@@ -37,17 +36,13 @@ var hashCmd = &cobra.Command{
 	Args:  cobra.MinimumNArgs(2),
 	Run: func(cmd *cobra.Command, args []string) {
 		statusbar.Start()
-		results, err := sumdiff.HashWithArgs(args...)
+		list, err := sumdiff.HashWithArgs(args...)
 		statusbar.Stop()
 		if err != nil {
-			plog.Println(err)
+			writer.MustWrite(vo.NewErrInfo(err))
 			return
 		}
-		if len(results) == 1 {
-			plog.Writeln(results[0].Hash)
-		} else {
-			plog.WriteTable(vo.HashToTable(results))
-		}
+		writer.MustWrite(list)
 	},
 }
 

cmd/md5.go

@@ -26,7 +26,6 @@ import (
 	"github.com/foolin/sumdiff/vo"
 
 	"github.com/foolin/sumdiff"
-	"github.com/foolin/sumdiff/internal/plog"
 	"github.com/foolin/sumdiff/internal/statusbar"
 	"github.com/spf13/cobra"
 )
@@ -39,17 +38,13 @@ var md5Cmd = &cobra.Command{
 	Args:  cobra.MinimumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		statusbar.Start()
-		results, err := sumdiff.Hash(md5.New(), args...)
+		list, err := sumdiff.Hash(md5.New(), args...)
 		statusbar.Stop()
 		if err != nil {
-			plog.Println(err)
+			writer.MustWrite(vo.NewErrInfo(err))
 			return
 		}
-		if len(results) == 1 {
-			plog.Writeln(results[0].Hash)
-		} else {
-			plog.WriteTable(vo.HashToTable(results))
-		}
+		writer.MustWrite(list)
 	},
 }
 

cmd/root.go

@@ -22,13 +22,18 @@ THE SOFTWARE.
 package cmd
 
 import (
-	"github.com/foolin/sumdiff/internal/plog"
 	"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"
 )
 
-var verbose bool
+var config *Config
+var writer *write.Writer
+var file *os.File
 
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
@@ -39,8 +44,43 @@ 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.Println("verbose:", verbose)
-		plog.SetVerbose(verbose)
+		//Verbose
+		vlog.SetVerbose(config.Verbose)
+
+		//Write
+		format := write.Table
+		if config.Format != "" {
+			var ok bool
+			format, ok = write.FormatOfName(config.Format)
+			if !ok {
+				vlog.Exit(1, "Format invalid: %v\n", config.Format)
+				return
+			}
+		}
+
+		w := os.Stdout
+		if config.Output != "" {
+			path := util.FormatPath(config.Output)
+			_ = os.MkdirAll(filepath.Dir(path), 0755)
+			var err error
+			file, err = os.OpenFile(path, os.O_CREATE|os.O_TRUNC|os.O_RDWR, 0666)
+			if err != nil {
+				vlog.Exit(1, "Open file %v error: %\n", path, err)
+				return
+			}
+			w = file
+		}
+
+		//Create writer
+		writer = write.New(w, format)
+	},
+	PersistentPostRun: func(cmd *cobra.Command, args []string) {
+		if file != nil {
+			err := file.Close()
+			if err != nil {
+				vlog.Printf("Close file error: %v\n", err)
+			}
+		}
 	},
 }
 
@@ -59,8 +99,15 @@ func init() {
 	// Cobra supports persistent flags, which, if defined here,
 	// will be global for your application.
 
+	config = &Config{
+		Verbose: false,
+		Format:  "table",
+		Output:  "",
+	}
 	// rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.sumdiff.yaml)")
-	rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "Verbose output info")
+	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.Output, "output", "o", "", "Output filename")
 
 	// Cobra also supports local flags, which will only run
 	// when this action is called directly.

cmd/sha1.go

@@ -26,7 +26,6 @@ import (
 	"github.com/foolin/sumdiff/vo"
 
 	"github.com/foolin/sumdiff"
-	"github.com/foolin/sumdiff/internal/plog"
 	"github.com/foolin/sumdiff/internal/statusbar"
 	"github.com/spf13/cobra"
 )
@@ -39,17 +38,13 @@ var sha1Cmd = &cobra.Command{
 	Args:  cobra.MinimumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		statusbar.Start()
-		results, err := sumdiff.Hash(sha1.New(), args...)
+		list, err := sumdiff.Hash(sha1.New(), args...)
 		statusbar.Stop()
 		if err != nil {
-			plog.Println(err)
+			writer.MustWrite(vo.NewErrInfo(err))
 			return
 		}
-		if len(results) == 1 {
-			plog.Writeln(results[0].Hash)
-		} else {
-			plog.WriteTable(vo.HashToTable(results))
-		}
+		writer.MustWrite(list)
 	},
 }
 

cmd/sha256.go

@@ -26,7 +26,6 @@ import (
 	"github.com/foolin/sumdiff/vo"
 
 	"github.com/foolin/sumdiff"
-	"github.com/foolin/sumdiff/internal/plog"
 	"github.com/foolin/sumdiff/internal/statusbar"
 	"github.com/spf13/cobra"
 )
@@ -39,17 +38,13 @@ var sha256Cmd = &cobra.Command{
 	Args:  cobra.MinimumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		statusbar.Start()
-		results, err := sumdiff.Hash(sha256.New(), args...)
+		list, err := sumdiff.Hash(sha256.New(), args...)
 		statusbar.Stop()
 		if err != nil {
-			plog.Println(err)
+			writer.MustWrite(vo.NewErrInfo(err))
 			return
 		}
-		if len(results) == 1 {
-			plog.Writeln(results[0].Hash)
-		} else {
-			plog.WriteTable(vo.HashToTable(results))
-		}
+		writer.MustWrite(list)
 	},
 }
 

cmp.go

@@ -11,13 +11,13 @@ import (
 	"github.com/hashicorp/go-multierror"
 )
 
-func Cmp(path1, path2 string) (ok bool, res []*vo.CmpVo, err error) {
+func Cmp(path1, path2 string) (ok bool, res vo.CmpList, err error) {
 	statusbar.Display("Comparing %v <-> %v", path1, path2)
 
 	path1 = util.FormatPath(path1)
 	path2 = util.FormatPath(path2)
 
-	result := vo.NewCmpVo(path1, path2)
+	result := vo.NewCmpInfo(path1, path2)
 	result.Equal = false
 	var outError error
 
@@ -35,26 +35,26 @@ func Cmp(path1, path2 string) (ok bool, res []*vo.CmpVo, err error) {
 
 	if outError != nil {
 		result.Msg = outError.Error()
-		return false, []*vo.CmpVo{result}, outError
+		return false, []vo.CmpInfo{result}, outError
 	}
 
 	if s1.IsDir() != s2.IsDir() {
 		//result.Msg = fmt.Sprintf("file type not equal [ %v != %v ]", util.FileType(s1.IsDir()), util.FileType(s2.IsDir()))
 		result.Msg = "not equal file type"
-		return false, []*vo.CmpVo{result}, outError
+		return false, []vo.CmpInfo{result}, outError
 	}
 
 	if s1.IsDir() {
 		return CmpDir(path1, path2)
 	} else {
 		ok, ret, err := CmpFile(path1, path2)
-		return ok, []*vo.CmpVo{ret}, err
+		return ok, []vo.CmpInfo{ret}, err
 	}
 }
 
-func CmpDir(path1, path2 string) (bool, []*vo.CmpVo, error) {
+func CmpDir(path1, path2 string) (bool, vo.CmpList, error) {
 	var outError error
-	outResult := vo.NewCmpVo(path1, path2)
+	outResult := vo.NewCmpInfo(path1, path2)
 
 	data1, err := listPathWithStatusbar(path1)
 	if err != nil {
@@ -71,15 +71,15 @@ func CmpDir(path1, path2 string) (bool, []*vo.CmpVo, error) {
 	if outError != nil {
 		outResult.Equal = false
 		outResult.Msg = outError.Error()
-		return false, []*vo.CmpVo{outResult}, outError
+		return false, []vo.CmpInfo{outResult}, outError
 	}
 
 	notEqualCount := 0
-	retList := make([]*vo.CmpVo, 0)
+	retList := make(vo.CmpList, 0)
 
 	for k, v1 := range data1 {
 		statusbar.Display("Comparing " + k)
-		itemResult := vo.NewCmpVo(k, k)
+		itemResult := vo.NewCmpInfo(k, k)
 		itemResult.Hash1.Size = v1.Info.Size()
 		itemResult.Equal = false
 		v2, ok := data2[k]
@@ -163,7 +163,7 @@ func CmpDir(path1, path2 string) (bool, []*vo.CmpVo, error) {
 
 	if len(data2) != 0 {
 		for k, v2 := range data2 {
-			itemResult := vo.NewCmpVo(k, k)
+			itemResult := vo.NewCmpInfo(k, k)
 			itemResult.Hash2.Size = v2.Info.Size()
 			itemResult.Equal = false
 			itemResult.Hash1.Error = fmt.Errorf("not exist [%v]", k)
@@ -177,8 +177,8 @@ func CmpDir(path1, path2 string) (bool, []*vo.CmpVo, error) {
 	return notEqualCount == 0, retList, nil
 }
 
-func CmpFile(file1, file2 string) (bool, *vo.CmpVo, error) {
-	result := vo.NewCmpVo(file1, file2)
+func CmpFile(file1, file2 string) (bool, vo.CmpInfo, error) {
+	result := vo.NewCmpInfo(file1, file2)
 	var outError error
 
 	f1, err := os.Stat(file1)

go.mod

@@ -13,6 +13,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/liushuochen/gotable v0.0.0-20221119160816-1113793e7092 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect

go.sum

@@ -7,6 +7,8 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/liushuochen/gotable v0.0.0-20221119160816-1113793e7092 h1:u9I3sJ+uTakxnRrvuYJGsEi4SvEMN+yB47WWGDHHxIk=
+github.com/liushuochen/gotable v0.0.0-20221119160816-1113793e7092/go.mod h1:CxUy8nDvutaC1pOfaG9TRoYwdHHqoNstSPPKhomC9k8=
 github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=