progress bars

go.mod

@@ -3,14 +3,17 @@ module github.com/boyter/hashit
 go 1.17
 
 require (
+	github.com/gosuri/uiprogress v0.0.1
 	github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
 	github.com/spf13/cobra v0.0.3
 	github.com/zeebo/blake3 v0.2.1
 	golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f
 )
 
 require (
+	github.com/gosuri/uilive v0.0.4 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/spf13/pflag v1.0.3 // indirect
-	golang.org/x/sys v0.0.0-20201014080544-cc95f250f6bc // indirect
+	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
 )

go.sum

@@ -1,5 +1,11 @@
+github.com/gosuri/uilive v0.0.4 h1:hUEBpQDj8D8jXgtCdBu7sWsy5sbW/5GhuO8KBwJ2jyY=
+github.com/gosuri/uilive v0.0.4/go.mod h1:V/epo5LjjlDE5RJUcqx8dbw+zc93y5Ya3yg8tfZ74VI=
+github.com/gosuri/uiprogress v0.0.1 h1:0kpv/XY/qTmFWl/SkaJykZXrBBzwwadmW8fRb7RJSxw=
+github.com/gosuri/uiprogress v0.0.1/go.mod h1:C1RTYn4Sc7iEyf6j8ft5dyoZ4212h8G1ol9QQluh5+0=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g=
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
 github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
@@ -20,4 +26,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201014080544-cc95f250f6bc h1:HVFDs9bKvTxP6bh1Rj9MCSo+UmafQtI8ZWDPVwVk9g4=
 golang.org/x/sys v0.0.0-20201014080544-cc95f250f6bc/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

main.go

@@ -77,6 +77,13 @@ func main() {
 		false,
 		"verbose output",
 	)
+	flags.BoolVarP(
+		&processor.Progress,
+		"progress",
+		"p",
+		false,
+		"display progress of files",
+	)
 	flags.BoolVar(
 		&processor.Debug,
 		"debug",

processor/processor.go

@@ -2,6 +2,7 @@ package processor
 
 import (
 	"fmt"
+	"github.com/gosuri/uiprogress"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -22,6 +23,9 @@ var Debug = false
 // Trace enables trace logging output which is extremely verbose
 var Trace = false
 
+// Progress uses ui bar to display the progress of files
+var Progress = false
+
 // Recursive to walk directories
 var Recursive = false
 
@@ -145,6 +149,10 @@ func Process() {
 			close(fileListQueue)
 		}()
 
+		if Progress {
+			uiprogress.Start() // start rendering of progress bars
+		}
+
 		var wg sync.WaitGroup
 		for i := 0; i < runtime.NumCPU(); i++ {
 			wg.Add(1)

processor/workers.go

@@ -9,13 +9,15 @@ import (
 	"crypto/sha512"
 	"encoding/hex"
 	"fmt"
+	"github.com/gosuri/uiprogress"
 	"github.com/minio/blake2b-simd"
 	"github.com/zeebo/blake3"
 	"golang.org/x/crypto/md4"
 	"golang.org/x/crypto/sha3"
 	"io"
 	"log"
 	"os"
+	"strings"
 	"sync"
 )
 
@@ -49,7 +51,7 @@ func fileProcessorWorker(input chan string, output chan Result) {
 			}
 
 			fileStartTime := makeTimestampMilli()
-			r, err := processScanner(res)
+			r, err := processScanner(res, int(fsize))
 			if Trace {
 				printTrace(fmt.Sprintf("milliseconds processMemoryMap: %s: %d", res, makeTimestampMilli()-fileStartTime))
 			}
@@ -98,7 +100,7 @@ func fileProcessorWorker(input chan string, output chan Result) {
 
 // TODO compare this to memory maps
 // Random tests indicate that mmap is faster when not in power save mode
-func processScanner(filename string) (Result, error) {
+func processScanner(filename string, fsize int) (Result, error) {
 	file, err := os.Open(filename)
 	if err != nil {
 		printError(fmt.Sprintf("opening file %s: %s", filename, err.Error()))
@@ -251,6 +253,16 @@ func processScanner(filename string) (Result, error) {
 		}()
 	}
 
+	var bar *uiprogress.Bar
+	if Progress {
+		bar = uiprogress.AddBar(fsize) // Add a new bar
+		bar.AppendFunc(func(b *uiprogress.Bar) string {
+			split := strings.Split(filename, "/")
+			return "file: " + split[len(split)-1]
+		})
+	}
+
+	sum := 0
 	data := make([]byte, 4_194_304)
 	for {
 		n, err := file.Read(data)
@@ -259,6 +271,11 @@ func processScanner(filename string) (Result, error) {
 			return Result{}, err
 		}
 
+		if Progress {
+			sum += n
+			_ = bar.Set(sum)
+		}
+
 		// Need to make a copy here as it can be modified before
 		// the goroutine processes it in the channel
 		tmp := make([]byte, len(data))