support for json output, refactor var naming

TechMDW · May 20, 2024 · b778fa3 · b778fa3
1 parent 70f2e04
commit b778fa3
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 29 deletions.
diff --git a/internal/cmd/root.go b/internal/cmd/root.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
 
@@ -20,6 +21,8 @@ var rootCmd = &cobra.Command{
 func hashRun(cmd *cobra.Command, args []string) {
 	filePath, _ := cmd.Flags().GetString("file")
 	hashType, _ := cmd.Flags().GetString("type")
+	jsonOutput, _ := cmd.Flags().GetBool("json")
+
 	var isFile bool
 	if filePath != "" {
 		isFile = true
@@ -44,8 +47,16 @@ func hashRun(cmd *cobra.Command, args []string) {
 			return
 		}
 
-		cmd.Println(hash.HexDigest)
-
+		if jsonOutput {
+			j, err := json.MarshalIndent(hash, "", "  ")
+			if err != nil {
+				cmd.PrintErr(err)
+				return
+			}
+			cmd.Println(string(j))
+		} else {
+			cmd.Println(hash.HexDigest)
+		}
 		return
 	}
 
@@ -61,8 +72,19 @@ func hashRun(cmd *cobra.Command, args []string) {
 		return
 	}
 
-	for _, h := range hashes.Array() {
-		cmd.Printf("%s: %s\n", h.Type, h.Hash)
+	if jsonOutput {
+		j, err := json.MarshalIndent(hashes, "", "  ")
+		if err != nil {
+			cmd.PrintErr(err)
+			return
+		}
+
+		cmd.Println(string(j))
+		return
+	} else {
+		for _, h := range hashes.Array() {
+			cmd.Printf("%s: %s\n", h.Type, h.Hash)
+		}
 	}
 
 }
@@ -77,4 +99,5 @@ func Execute() {
 func init() {
 	rootCmd.Flags().StringP("file", "f", "", "File to hash")
 	rootCmd.Flags().StringP("type", "t", "", "Type of hash function to use")
+	rootCmd.Flags().BoolP("json", "j", false, "Output as JSON")
 }
diff --git a/pkg/hash/generic.go b/pkg/hash/generic.go
@@ -27,33 +27,36 @@ const (
 
 // GenericHash represents a hash of data.
 type GenericHash struct {
-	Input     []byte
-	HashBytes []byte
-	HexDigest string
-	Duration  time.Duration
+	Input       []byte `json:"input"`
+	HashBytes   []byte `json:"hashBytes"`
+	HexDigest   string `json:"hexDigest"`
+	Duration    int64  `json:"duration"`
+	DurationStr string `json:"durationStr"`
 }
 
 // Hash returns a hash of the data using the specified hash type.
 func Hash(data []byte, hash hash.Hash) *GenericHash {
-	start := time.Now()
+	timeStart := time.Now()
 
-	sha := &GenericHash{
+	gh := &GenericHash{
 		Input: data,
 	}
 
 	hash.Write(data)
-	sha.HashBytes = hash.Sum(nil)
-	sha.HexDigest = fmt.Sprintf("%x", sha.HashBytes)
-	sha.Duration = time.Since(start)
+	gh.HashBytes = hash.Sum(nil)
+	gh.HexDigest = fmt.Sprintf("%x", gh.HashBytes)
+	timeSince := time.Since(timeStart)
+	gh.Duration = timeSince.Milliseconds()
+	gh.DurationStr = timeSince.String()
 
-	return sha
+	return gh
 }
 
 // HashFile returns a hash of the file using the specified hash type.
 func HashFile(path string, hash hash.Hash) (*GenericHash, error) {
-	start := time.Now()
+	timeStart := time.Now()
 
-	sha := &GenericHash{
+	gh := &GenericHash{
 		Input: []byte(path),
 	}
 
@@ -75,11 +78,13 @@ func HashFile(path string, hash hash.Hash) (*GenericHash, error) {
 		hash.Write(buf[:n])
 	}
 
-	sha.HashBytes = hash.Sum(nil)
-	sha.HexDigest = fmt.Sprintf("%x", sha.HashBytes)
-	sha.Duration = time.Since(start)
+	gh.HashBytes = hash.Sum(nil)
+	gh.HexDigest = fmt.Sprintf("%x", gh.HashBytes)
+	timeSince := time.Since(timeStart)
+	gh.Duration = timeSince.Milliseconds()
+	gh.DurationStr = timeSince.String()
 
-	return sha, nil
+	return gh, nil
 }
 
 // ComputeHash returns a hash of the data using the specified hash type.

diff --git a/pkg/hash/hashes.go b/pkg/hash/hashes.go
@@ -13,6 +13,7 @@ import (
 	"hash/fnv"
 	"io"
 	"os"
+	"time"
 
 	"golang.org/x/crypto/blake2b"
 	"golang.org/x/crypto/blake2s"
@@ -21,15 +22,17 @@ import (
 )
 
 type Hashes struct {
-	Adler32 string `json:"adler32"`
-	MD4     string `json:"md4"`
-	MD5     string `json:"md5"`
-	SHA1    string `json:"sha1"`
-	SHA2    SHA2   `json:"sha2"`
-	SHA3    SHA3   `json:"sha3"`
-	FNV     FNV    `json:"fnv"`
-	CRC     CRC    `json:"crc"`
-	Blake   Blake  `json:"blake"`
+	Adler32     string `json:"adler32"`
+	MD4         string `json:"md4"`
+	MD5         string `json:"md5"`
+	SHA1        string `json:"sha1"`
+	SHA2        SHA2   `json:"sha2"`
+	SHA3        SHA3   `json:"sha3"`
+	FNV         FNV    `json:"fnv"`
+	CRC         CRC    `json:"crc"`
+	Blake       Blake  `json:"blake"`
+	Duration    int64  `json:"duration"`
+	DurationStr string `json:"durationStr"`
 }
 
 type SHA2 struct {
@@ -177,6 +180,7 @@ func setHashes(hashes *Hashes, hashers []hash.Hash) {
 }
 
 func HasherMulti(b []byte) (Hashes, error) {
+	timeStart := time.Now()
 	hashers, hashes := initializeHashers()
 	multiWriter := io.MultiWriter(convertToWriters(hashers)...)
 
@@ -186,10 +190,14 @@ func HasherMulti(b []byte) (Hashes, error) {
 	}
 
 	setHashes(hashes, hashers)
+	timeSince := time.Since(timeStart)
+	hashes.Duration = timeSince.Milliseconds()
+	hashes.DurationStr = timeSince.String()
 	return *hashes, nil
 }
 
 func HasherMultiFile(path string) (Hashes, error) {
+	timeStart := time.Now()
 	hashers, hashes := initializeHashers()
 	multiWriter := io.MultiWriter(convertToWriters(hashers)...)
 
@@ -205,6 +213,9 @@ func HasherMultiFile(path string) (Hashes, error) {
 	}
 
 	setHashes(hashes, hashers)
+	timeSince := time.Since(timeStart)
+	hashes.Duration = timeSince.Milliseconds()
+	hashes.DurationStr = timeSince.String()
 	return *hashes, nil
 }