update codes.

Author: drliufu

cmd/diff.go

@@ -11,18 +11,16 @@ import (
 
 // diffCmd represents the diff command
 var diffCmd = &cobra.Command{
-	Use:   "diff [path1] [path2]",
+	Use:   "diff <path1> <path2>",
 	Short: "Compare different files or directory",
 	Long:  `Compare different files or directory`,
 	Args:  cobra.MinimumNArgs(2),
 	Run: func(cmd *cobra.Command, args []string) {
 		ret, err := app.Diff(args[0], args[1])
 		if err != nil {
-			plog.PrintEnd(err.Error())
-		} else {
-			plog.PrintEnd("%v", ret)
+			plog.Writeln(err.Error())
 		}
-
+		plog.Writeln(ret)
 	},
 }
 

cmd/hash.go

@@ -4,46 +4,25 @@ Copyright © 2023 Foolin
 package cmd
 
 import (
-	"crypto/md5"
-	"crypto/sha1"
-	"crypto/sha256"
-	"crypto/sha512"
 	"github.com/foolin/sumdiff/internal/app"
 	"github.com/foolin/sumdiff/internal/plog"
 	"github.com/foolin/sumdiff/internal/vo"
 	"github.com/spf13/cobra"
-	"hash"
-	"strings"
 )
 
 // hashCmd represents the hash command
 var hashCmd = &cobra.Command{
-	Use:   "hash [md5|sha1|sha256|sha512] [path] ...",
-	Short: "Calculate file hash hex string",
-	Long:  `Calculate file hash hex string`,
+	Use:   "hash <algorithm> <path> ...",
+	Short: "Calculate hash algorithm [md5|sha1|sha256|sha512] hex string",
+	Long:  `Calculate hash algorithm [md5|sha1|sha256|sha512] hex string, eg: hash sha1 a.text`,
 	Args:  cobra.MinimumNArgs(2),
 	Run: func(cmd *cobra.Command, args []string) {
-		t := strings.ToLower(args[0])
-		var hash hash.Hash
-		switch t {
-		case "md5":
-			hash = md5.New()
-		case "sha1":
-			hash = sha1.New()
-		case "sha256":
-			hash = sha256.New()
-		case "sha512":
-			hash = sha512.New()
-		default:
-			plog.PrintEnd("not support hash=%v", t)
-			return
-		}
-		results, err := app.Hash(hash, args[1:]...)
+		results, err := app.HashWithArgs(args...)
 		if err != nil {
-			plog.PrintEnd("hash error: %v", err)
+			plog.Writeln(err)
 			return
 		}
-		plog.PrintTable(vo.HashToTable(results))
+		plog.WriteTable(vo.HashToTable(results))
 	},
 }
 

internal/app/diff.go

@@ -37,7 +37,7 @@ func DiffDir(path1, path2 string) (bool, error) {
 		return false, err
 	}
 	if len(data1) != len(data2) {
-		return false, fmt.Errorf("not equal file count [%v!=%v]", len(data1), len(data2))
+		return false, fmt.Errorf("not equal files count [%v!=%v]", len(data1), len(data2))
 	}
 	for k, v1 := range data1 {
 		plog.Progress("compare diff path " + k)

internal/app/hash.go

@@ -1,7 +1,12 @@
 package app
 
 import (
+	"crypto/md5"
+	"crypto/sha1"
+	"crypto/sha256"
+	"crypto/sha512"
 	"fmt"
+	"github.com/foolin/sumdiff/internal/plog"
 	"github.com/foolin/sumdiff/internal/util"
 	"github.com/foolin/sumdiff/internal/vo"
 	"hash"
@@ -11,6 +16,25 @@ import (
 	"strings"
 )
 
+func HashWithArgs(args ...string) (results []vo.HashVo, err error) {
+	t := strings.ToLower(args[0])
+	var algo hash.Hash
+	switch t {
+	case "md5":
+		algo = md5.New()
+	case "sha1":
+		algo = sha1.New()
+	case "sha256":
+		algo = sha256.New()
+	case "sha512":
+		algo = sha512.New()
+	default:
+		plog.Writef("not support algo=%v", t)
+		return
+	}
+	return Hash(algo, args[1:]...)
+}
+
 func Hash(h hash.Hash, paths ...string) (results []vo.HashVo, err error) {
 	if len(paths) == 0 {
 		return results, fmt.Errorf("at least one file is required")

internal/plog/print.go

@@ -10,36 +10,34 @@ import (
 
 const maxWidth = 100
 
-var Writer io.Writer = os.Stdout
+var printer io.Writer = os.Stdout
+var writer io.Writer = os.Stderr
 
 func Print(a ...any) {
-	_, _ = Writer.Write([]byte(fmt.Sprint(a...)))
+	_, _ = printer.Write([]byte(fmt.Sprint(a...)))
 }
 
 func Printf(format string, a ...any) {
-	_, _ = Writer.Write([]byte(fmt.Sprintf(format, a...)))
+	_, _ = printer.Write([]byte(fmt.Sprintf(format, a...)))
 }
 
 func Println(a ...any) {
-	_, _ = Writer.Write([]byte(fmt.Sprintln(a...)))
+	_, _ = printer.Write([]byte(fmt.Sprintln(a...)))
 }
 
-func Progress(format string, a ...any) {
-	msg := fmt.Sprintf(format, a...)
-	fmt.Printf("%s\r", runewidth.Truncate(msg, maxWidth-3, "..."))
+func Write(a ...any) {
+	_, _ = writer.Write([]byte(fmt.Sprint(a...)))
 }
-func PrintEnd(format string, a ...any) {
-	msg := fmt.Sprintf(format, a...)
-	Printf("%s\r", runewidth.FillLeft(" ", maxWidth))
-	Println(msg)
+
+func Writef(format string, a ...any) {
+	_, _ = writer.Write([]byte(fmt.Sprintf(format, a...)))
 }
 
-func PrintError(path string, message string) {
-	fmt.Printf("| %-60s | %s |\n", runewidth.Truncate(path, 50, "..."), message)
-	//fmt.Printf("| %-20s | %-20s |\n", path, message)
+func Writeln(a ...any) {
+	_, _ = writer.Write([]byte(fmt.Sprintln(a...)))
 }
 
-func PrintTable(table [][]string) {
+func WriteTable(table [][]string) {
 	// get number of columns from the first table row
 	columnLengths := make([]int, len(table[0]))
 	for _, line := range table {
@@ -71,3 +69,13 @@ func PrintTable(table [][]string) {
 		}
 	}
 }
+
+func Progress(format string, a ...any) {
+	msg := fmt.Sprintf(format, a...)
+	fmt.Printf("%s\r", runewidth.Truncate(msg, maxWidth-3, "..."))
+}
+func ProgressEnd(format string, a ...any) {
+	msg := fmt.Sprintf(format, a...)
+	fmt.Printf("%s\r", runewidth.FillLeft(" ", maxWidth))
+	fmt.Println(msg)
+}