diff --git a/bar.go b/bar.go index cdc3807..2089135 100644 --- a/bar.go +++ b/bar.go @@ -72,7 +72,7 @@ char rune till int64 } - toRenderReader struct { + renderedReader struct { io.Reader toComplete bool toRemove bool @@ -307,8 +307,8 @@ } } -func (b *Bar) render(tw int, pSyncer, aSyncer *widthSyncer) <-chan *toRenderReader { - ch := make(chan *toRenderReader, 1) +func (b *Bar) render(tw int, pSyncer, aSyncer *widthSyncer) <-chan *renderedReader { + ch := make(chan *renderedReader, 1) go func() { select { @@ -323,7 +323,7 @@ s.completed = true r = strings.NewReader(s.panicMsg) } - ch <- &toRenderReader{r, s.completed, s.removed} + ch <- &renderedReader{r, s.completed, s.removed} }() s.draw(tw, pSyncer, aSyncer) r = io.MultiReader(s.bufP, s.bufB, s.bufA) @@ -337,7 +337,7 @@ s.draw(tw, pSyncer, aSyncer) r = io.MultiReader(s.bufP, s.bufB, s.bufA) } - ch <- &toRenderReader{r, s.completed, s.removed} + ch <- &renderedReader{r, s.completed, s.removed} } }() diff --git a/progress.go b/progress.go index f9c3c28..d607d0b 100644 --- a/progress.go +++ b/progress.go @@ -56,9 +56,9 @@ Accumulator []chan int Distributor []chan int } - toRenderSnapshot struct { - bar *Bar - pipe <-chan *toRenderReader + barRendering struct { + bar *Bar + ready <-chan *renderedReader } ) @@ -201,15 +201,15 @@ close(timeout) }) - for _, trs := range s.renderByPriority(tw, pSyncer, aSyncer) { - r := <-trs.pipe + for _, br := range s.renderByPriority(tw, pSyncer, aSyncer) { + r := <-br.ready _, err = s.cw.ReadFrom(r) - if !trs.bar.completed && r.toComplete { - trs.bar.completed = true - close(trs.bar.shutdown) + if !br.bar.completed && r.toComplete { + br.bar.completed = true + close(br.bar.shutdown) } if r.toRemove { - s.heapUpdated = heap.Remove(s.bHeap, trs.bar.index) != nil + s.heapUpdated = heap.Remove(s.bHeap, br.bar.index) != nil } } @@ -223,14 +223,14 @@ return } -func (s *pState) renderByPriority(tw int, pSyncer, aSyncer *widthSyncer) []*toRenderSnapshot { - slice := make([]*toRenderSnapshot, 0, s.bHeap.Len()) +func (s *pState) renderByPriority(tw int, pSyncer, aSyncer *widthSyncer) []*barRendering { + slice := make([]*barRendering, 0, s.bHeap.Len()) for s.bHeap.Len() > 0 { b := heap.Pop(s.bHeap).(*Bar) defer heap.Push(s.bHeap, b) - slice = append(slice, &toRenderSnapshot{ - bar: b, - pipe: b.render(tw, pSyncer, aSyncer), + slice = append(slice, &barRendering{ + bar: b, + ready: b.render(tw, pSyncer, aSyncer), }) } return slice