Show a spinner until the first Inc()

Author: mhagger

src/meter/meter.go

@@ -10,10 +10,8 @@ import (
 
 // Progress is an interface for a simple progress meter. Call
 // `Start()` to begin reporting. `format` should include some kind of
-// '%d' field, into which will be written the current count. The
-// format should be constructed so that the new output covers up the
-// old output (e.g., it should be fixed length or include some
-// trailing spaces). A CR character will be added automatically.
+// '%d' field, into which will be written the current count. A spinner
+// and a CR character will be added automatically.
 //
 // Call `Inc()` every time the quantity of interest increases. Call
 // `Stop()` to stop reporting. After an instance's `Stop()` method has
@@ -26,13 +24,16 @@ type Progress interface {
 	Done()
 }
 
+var Spinners = []string{"|", "(", "<", "-", "<", "(", "|", ")", ">", "-", ">", ")"}
+
 // progressMeter is a `Progress` that reports the current state every
 // `period`.
 type progressMeter struct {
 	lock           sync.Mutex
 	format         string
 	period         time.Duration
 	lastShownCount int64
+	spinnerIndex   int
 	// When `ticker` is changed, that tells the old goroutine that
 	// it's time to shut down.
 	ticker *time.Ticker
@@ -50,9 +51,10 @@ func NewProgressMeter(period time.Duration) Progress {
 func (p *progressMeter) Start(format string) {
 	p.lock.Lock()
 	defer p.lock.Unlock()
-	p.format = "\r" + format
+	p.format = format + "   %s                    %s"
 	atomic.StoreInt64(&p.count, 0)
 	p.lastShownCount = -1
+	p.spinnerIndex = 0
 	ticker := time.NewTicker(p.period)
 	p.ticker = ticker
 	go func() {
@@ -66,10 +68,14 @@ func (p *progressMeter) Start(format string) {
 				return
 			}
 			c := atomic.LoadInt64(&p.count)
-			if c != p.lastShownCount {
-				fmt.Fprintf(os.Stderr, p.format, c)
-				p.lastShownCount = c
+			var s string
+			if c == 0 {
+				p.spinnerIndex = (p.spinnerIndex + 1) % len(Spinners)
+				s = Spinners[p.spinnerIndex]
+			} else {
+				s = ""
 			}
+			fmt.Fprintf(os.Stderr, p.format, c, s, "\r")
 			p.lock.Unlock()
 		}
 	}()
@@ -88,7 +94,7 @@ func (p *progressMeter) Done() {
 	defer p.lock.Unlock()
 	p.ticker = nil
 	c := atomic.LoadInt64(&p.count)
-	fmt.Fprintf(os.Stderr, p.format+"\n", c)
+	fmt.Fprintf(os.Stderr, p.format, c, " ", "\n")
 }
 
 // NoProgressMeter is a `Progress` that doesn't actually report

src/sizes/graph.go

@@ -124,7 +124,7 @@ func ScanRepositoryUsingGraph(
 	var trees, tags []ObjectHeader
 	var commits []CommitHeader
 
-	progressMeter.Start("Processing blobs: %-20d")
+	progressMeter.Start("Processing blobs: %d")
 	for {
 		oid, objectType, objectSize, err := iter.Next()
 		if err != nil {
@@ -208,7 +208,7 @@ func ScanRepositoryUsingGraph(
 		errChan <- nil
 	}()
 
-	progressMeter.Start("Processing trees: %-20d")
+	progressMeter.Start("Processing trees: %d")
 	for _ = range trees {
 		oid, objectType, _, data, err := objectIter.Next()
 		if err != nil {
@@ -235,7 +235,7 @@ func ScanRepositoryUsingGraph(
 	// Process the commits in (roughly) chronological order, to
 	// minimize the number of commits that are pending at any one
 	// time:
-	progressMeter.Start("Processing commits: %-20d")
+	progressMeter.Start("Processing commits: %d")
 	for i := len(commits); i > 0; i-- {
 		oid, objectType, _, data, err := objectIter.Next()
 		if err != nil {
@@ -263,15 +263,15 @@ func ScanRepositoryUsingGraph(
 	// Tell PathResolver about the commits in (roughly) reverse
 	// chronological order, to favor new ones in the paths of trees:
 	if nameStyle != NameStyleNone {
-		progressMeter.Start("Matching commits to trees: %-20d")
+		progressMeter.Start("Matching commits to trees: %d")
 		for _, commit := range commits {
 			progressMeter.Inc()
 			graph.pathResolver.RecordCommit(commit.oid, commit.tree)
 		}
 		progressMeter.Done()
 	}
 
-	progressMeter.Start("Processing annotated tags: %-20d")
+	progressMeter.Start("Processing annotated tags: %d")
 	for range tags {
 		oid, objectType, _, data, err := objectIter.Next()
 		if err != nil {
@@ -297,7 +297,7 @@ func ScanRepositoryUsingGraph(
 		return HistorySize{}, err
 	}
 
-	progressMeter.Start("Processing references: %-20d")
+	progressMeter.Start("Processing references: %d")
 	for _, ref := range refs {
 		progressMeter.Inc()
 		graph.RegisterReference(ref)