diff --git a/bar.go b/bar.go index 972fd54..60140fc 100644 --- a/bar.go +++ b/bar.go @@ -52,7 +52,7 @@ buffers [3]*bytes.Buffer filler BarFiller extender extenderFunc - refreshCh chan time.Time + renderReq chan<- time.Time waitBar *Bar // key for (*pState).queueBars } @@ -456,13 +456,13 @@ // Technically this call isn't required, but if refresh rate is set to // one hour for example and bar completes within a few minutes p.Wait() // will wait for one hour. This call helps to avoid unnecessary waiting. - go b.tryEarlyRefresh(s.refreshCh) + go b.tryEarlyRefresh(s.renderReq) } else { b.cancel() } } -func (b *Bar) tryEarlyRefresh(refreshCh chan<- time.Time) { +func (b *Bar) tryEarlyRefresh(renderReq chan<- time.Time) { var anyOtherRunning bool b.container.traverseBars(func(bar *Bar) bool { anyOtherRunning = b != bar && bar.IsRunning() @@ -471,7 +471,7 @@ if !anyOtherRunning { for { select { - case refreshCh <- time.Now(): + case renderReq <- time.Now(): case <-b.done: return } diff --git a/progress.go b/progress.go index 1b9be29..41997c8 100644 --- a/progress.go +++ b/progress.go @@ -36,7 +36,7 @@ ctx context.Context hm heapManager dropS, dropD chan struct{} - refreshCh chan time.Time + renderReq chan time.Time idCount int popPriority int @@ -70,7 +70,7 @@ hm: make(heapManager), dropS: make(chan struct{}), dropD: make(chan struct{}), - refreshCh: make(chan time.Time), + renderReq: make(chan time.Time), refreshRate: defaultRefreshRate, popPriority: math.MinInt32, queueBars: make(map[*Bar]*Bar), @@ -247,7 +247,7 @@ op(s) case fn := <-p.interceptIO: fn(cw) - case <-s.refreshCh: + case <-s.renderReq: e := render() if e != nil { p.cancel() // cancel all bars @@ -282,7 +282,7 @@ for { select { case t := <-ticker.C: - s.refreshCh <- t + s.renderReq <- t case <-s.ctx.Done(): close(done) return @@ -295,9 +295,9 @@ select { case x := <-s.manualRC: if t, ok := x.(time.Time); ok { - s.refreshCh <- t + s.renderReq <- t } else { - s.refreshCh <- time.Now() + s.renderReq <- time.Now() } case <-s.ctx.Done(): close(done) @@ -413,7 +413,7 @@ reqWidth: s.reqWidth, total: total, filler: filler, - refreshCh: s.refreshCh, + renderReq: s.renderReq, autoRefresh: s.autoRefresh, }