Add ability to get progress bar instead of file log

Signed-off-by: Igor Shishkin <me@teran.ru>

src/checksum/cmd/main.go

@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
+	"gopkg.in/cheggaaa/pb.v1"
 
 	"checksum/database"
 )
@@ -26,10 +27,12 @@ var db *database.Database
 
 var filePattern *regexp.Regexp
 
-var cntAdded uint64
-var cntFailed uint64
-var cntMissed uint64
-var cntPassed uint64
+var (
+	cntAdded  uint64
+	cntFailed uint64
+	cntMissed uint64
+	cntPassed uint64
+)
 
 func main() {
 	flag.Usage = func() {
@@ -43,6 +46,8 @@ func main() {
 		fmt.Printf("    Specify data directory\n")
 		fmt.Printf("  -pattern <string>\n")
 		fmt.Printf("    Pattern to match filenames which checking for new files(default is `.(3fr|ari|arw|bay|crw|cr2|cap|data|dcs|dcr|drf|eip|erf|fff|gpr|iiq|k25|kdc|mdc|mef|mos|mrw|nef|nrw|obm|orf|pef|ptx|pxn|r3d|raf|raw|rwl|rw2|rwz|sr2|srf|srw|x3f)$`)\n")
+		fmt.Printf("  -progressbar\n")
+		fmt.Printf("    Show progress bar instead of printing handled files(the same as `-skipfailed`, `-skipmissed`, `-skipok` but with pretty progress bar)")
 		fmt.Printf("  -skipfailed\n")
 		fmt.Printf("    Skip FAIL verification results from output\n")
 		fmt.Printf("  -skipmissed\n")
@@ -63,6 +68,7 @@ func main() {
 	skipfailed := flag.Bool("skipfailed", false, "")
 	skipmissed := flag.Bool("skipmissed", false, "")
 	skipok := flag.Bool("skipok", false, "")
+	progressbar := flag.Bool("progressbar", false, "")
 
 	flag.Parse()
 
@@ -76,6 +82,12 @@ func main() {
 		return
 	}
 
+	if *progressbar == true {
+		*skipfailed = true
+		*skipmissed = true
+		*skipok = true
+	}
+
 	var err error
 
 	db = database.NewDatabase(*dbPath)
@@ -84,11 +96,27 @@ func main() {
 		log.Fatalf("Error compiling pattern: %s", err)
 	}
 	sem := make(chan bool, *concurrency)
+	var bar *pb.ProgressBar
+	if *progressbar {
+		bar = pb.New(db.Count())
+		bar.ShowCounters = true
+		bar.SetRefreshRate(time.Second)
+		bar.ShowPercent = true
+		bar.ShowBar = true
+		bar.ShowTimeLeft = true
+		bar.ShowSpeed = true
+		bar.Start()
+	}
 
 	for file, obj := range db.MapObjects() {
 		sem <- true
 		wg.Add(1)
 		go func(file string, obj database.Data) {
+			if *progressbar {
+				defer func() {
+					bar.Increment()
+				}()
+			}
 			defer func() {
 				<-sem
 			}()
@@ -123,6 +151,10 @@ func main() {
 	}
 	wg.Wait()
 
+	if *progressbar {
+		bar.Finish()
+	}
+
 	fmt.Printf("%s Verification step complete. Checking for new files on %s\n", color.CyanString("[INFO]"), *datadir)
 
 	err = filepath.Walk(*datadir, func(path string, info os.FileInfo, err error) error {

src/vendor.conf

@@ -6,3 +6,5 @@ github.com/fatih/color	v1.5.0-8-g5df930a
 github.com/mattn/go-colorable	v0.0.9-10-g586e6dc
 github.com/mattn/go-isatty	v0.0.3-7-g6ca4dbf
 golang.org/x/sys	8380141
+gopkg.in/cheggaaa/pb.v1 v1.0.22
+github.com/mattn/go-runewidth 97311d9