Replace restic.Progress with new progress.Counter

This fixes two race conditions while cleaning up the code.

cmd/restic/cmd_prune.go

@@ -296,7 +296,6 @@ func prune(opts PruneOptions, gopts GlobalOptions, repo restic.Repository, usedB
 
 	// loop over all packs and decide what to do
 	bar := newProgressMax(!gopts.Quiet, uint64(len(indexPack)), "packs processed")
-	bar.Start()
 	err := repo.List(ctx, restic.PackFile, func(id restic.ID, packSize int64) error {
 		p, ok := indexPack[id]
 		if !ok {
@@ -345,7 +344,7 @@ func prune(opts PruneOptions, gopts GlobalOptions, repo restic.Repository, usedB
 		}
 
 		delete(indexPack, id)
-		bar.Report(restic.Stat{Blobs: 1})
+		bar.Add(1)
 		return nil
 	})
 	bar.Done()
@@ -517,6 +516,7 @@ func rebuildIndexFiles(gopts GlobalOptions, repo restic.Repository, removePacks
 	bar := newProgressMax(!gopts.Quiet, packcount, "packs processed")
 	obsoleteIndexes, err := (repo.Index()).(*repository.MasterIndex).
 		Save(gopts.ctx, repo, removePacks, bar)
+	bar.Done()
 	if err != nil {
 		return err
 	}
@@ -533,7 +533,6 @@ func getUsedBlobs(gopts GlobalOptions, repo restic.Repository, snapshots []*rest
 	usedBlobs = restic.NewBlobSet()
 
 	bar := newProgressMax(!gopts.Quiet, uint64(len(snapshots)), "snapshots")
-	bar.Start()
 	defer bar.Done()
 	for _, sn := range snapshots {
 		debug.Log("process snapshot %v", sn.ID())
@@ -548,7 +547,7 @@ func getUsedBlobs(gopts GlobalOptions, repo restic.Repository, snapshots []*rest
 		}
 
 		debug.Log("processed snapshot %v", sn.ID())
-		bar.Report(restic.Stat{Blobs: 1})
+		bar.Add(1)
 	}
 	return usedBlobs, nil
 }

cmd/restic/delete.go

@@ -33,8 +33,8 @@ func deleteFiles(gopts GlobalOptions, ignoreError bool, repo restic.Repository,
 	}()
 
 	bar := newProgressMax(!gopts.JSON && !gopts.Quiet, uint64(totalCount), "files deleted")
+	defer bar.Done()
 	wg, ctx := errgroup.WithContext(gopts.ctx)
-	bar.Start()
 	for i := 0; i < numDeleteWorkers; i++ {
 		wg.Go(func() error {
 			for id := range fileChan {
@@ -51,12 +51,11 @@ func deleteFiles(gopts GlobalOptions, ignoreError bool, repo restic.Repository,
 				if !gopts.JSON && gopts.verbosity > 2 {
 					Verbosef("removed %v\n", h)
 				}
-				bar.Report(restic.Stat{Blobs: 1})
+				bar.Add(1)
 			}
 			return nil
 		})
 	}
 	err := wg.Wait()
-	bar.Done()
 	return err
 }

cmd/restic/progress.go

@@ -2,35 +2,45 @@ package main
 
 import (
 	"fmt"
+	"os"
+	"strconv"
 	"time"
 
-	"github.com/restic/restic/internal/restic"
+	"github.com/restic/restic/internal/ui/progress"
 )
 
-// newProgressMax returns a progress that counts blobs.
-func newProgressMax(show bool, max uint64, description string) *restic.Progress {
+// newProgressMax returns a progress.Counter that prints to stdout.
+func newProgressMax(show bool, max uint64, description string) *progress.Counter {
 	if !show {
 		return nil
 	}
 
-	p := restic.NewProgress()
+	interval := time.Second / 60
+	if !stdinIsTerminal() {
+		interval = time.Second
+	} else {
+		fps, err := strconv.ParseInt(os.Getenv("RESTIC_PROGRESS_FPS"), 10, 64)
+		if err == nil && fps >= 1 {
+			if fps > 60 {
+				fps = 60
+			}
+			interval = time.Second / time.Duration(fps)
+		}
+	}
 
-	p.OnUpdate = func(s restic.Stat, d time.Duration, ticker bool) {
+	return progress.New(interval, func(v uint64, d time.Duration, final bool) {
 		status := fmt.Sprintf("[%s] %s  %d / %d %s",
 			formatDuration(d),
-			formatPercent(s.Blobs, max),
-			s.Blobs, max, description)
+			formatPercent(v, max),
+			v, max, description)
 
 		if w := stdoutTerminalWidth(); w > 0 {
 			status = shortenStatus(w, status)
 		}
 
 		PrintProgress("%s", status)
-	}
-
-	p.OnDone = func(s restic.Stat, d time.Duration, ticker bool) {
-		fmt.Printf("\n")
-	}
-
-	return p
+		if final {
+			fmt.Print("\n")
+		}
+	})
 }