From 717f195cf7cec52184710a9d55d1d4b81bceb615 Mon Sep 17 00:00:00 2001 From: "Stephen McQuay (smcquay)" Date: Wed, 18 Oct 2017 17:42:31 -0700 Subject: [PATCH] Store the filename and checksum separately --- hash.go | 7 ++++--- main.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hash.go b/hash.go index 9e45d96..01d2261 100644 --- a/hash.go +++ b/hash.go @@ -14,7 +14,8 @@ import ( // result is a message or error payload type result struct { - msg string + f string + cs string err error } @@ -52,7 +53,7 @@ func hsh(files []string) chan result { fmt.Fprintf(os.Stderr, "%v\n", err) os.Exit(1) } - r <- result{msg: fmt.Sprintf("%x -", hsh.Sum(nil))} + r <- result{cs: fmt.Sprintf("%x", hsh.Sum(nil)), f: "-"} close(r) }() return r @@ -92,7 +93,7 @@ func compute(h hashr, jobs chan checksum) chan result { r <- result{err: err} continue } - r <- result{msg: fmt.Sprintf("%x %s", hsh.Sum(nil), job.filename)} + r <- result{f: job.filename, cs: fmt.Sprintf("%x", hsh.Sum(nil))} } close(r) }() diff --git a/main.go b/main.go index c112d52..d926140 100644 --- a/main.go +++ b/main.go @@ -31,7 +31,7 @@ func main() { ec++ fmt.Fprintf(os.Stderr, "%v\n", res.err) } else { - fmt.Printf("%v\n", res.msg) + fmt.Printf("%v %v\n", res.cs, res.f) } } if ec > 0 {