Codebase list golang-github-vbauerster-mpb / 1f951a2
refactoring: drop completed var on bState struct Vladimir Bauer 1 year, 10 months ago
2 changed file(s) with 11 addition(s) and 11 deletion(s). Raw diff Collapse all Expand all
+11
-8
bar.go less more
3838 current int64
3939 refill int64
4040 trimSpace bool
41 completed bool
4241 aborted bool
4342 triggerComplete bool
4443 rmOnComplete bool
349348 func (b *Bar) Abort(drop bool) {
350349 select {
351350 case b.operateState <- func(s *bState) {
352 if s.completed || s.aborted {
351 if s.aborted || s.completed() {
353352 return
354353 }
355354 s.aborted = true
375374 func (b *Bar) Completed() bool {
376375 result := make(chan bool)
377376 select {
378 case b.operateState <- func(s *bState) { result <- s.completed }:
377 case b.operateState <- func(s *bState) { result <- s.completed() }:
379378 return <-result
380379 case <-b.bsOk:
381 return b.bs.completed
380 return b.bs.completed()
382381 }
383382 }
384383
403402 case op := <-b.operateState:
404403 op(bs)
405404 case <-b.ctx.Done():
406 bs.aborted = !bs.completed
405 bs.aborted = !bs.completed()
407406 bs.decoratorShutdownNotify(&b.container.bwg)
408407 b.bs = bs
409408 close(b.bsOk)
430429 if s.extender != nil {
431430 frame.rows, frame.err = s.extender(frame.rows, stat)
432431 }
433 if s.completed || s.aborted {
432 if s.aborted || s.completed() {
434433 frame.shutdown = s.shutdown
435434 frame.rmOnComplete = s.rmOnComplete
436435 frame.noPop = s.noPop
552551 }
553552
554553 func (s *bState) triggerCompletion(b *Bar) {
555 s.completed = s.current == s.total
554 s.triggerComplete = true
556555 if s.autoRefresh {
557556 // Technically this call isn't required, but if refresh rate is set to
558557 // one hour for example and bar completes within a few minutes p.Wait()
561560 } else {
562561 b.cancel()
563562 }
563 }
564
565 func (s bState) completed() bool {
566 return s.triggerComplete && s.current == s.total
564567 }
565568
566569 func (s bState) decoratorEwmaUpdate(n int64, dur time.Duration, wg *sync.WaitGroup) {
619622 Total: s.total,
620623 Current: s.current,
621624 Refill: s.refill,
622 Completed: s.completed,
625 Completed: s.completed(),
623626 Aborted: s.aborted,
624627 }
625628 }
+0
-3
draw_test.go less more
785785 s.current = tc.current
786786 s.trimSpace = tc.trim
787787 s.refill = tc.refill
788 s.completed = tc.total > 0 && tc.current >= tc.total
789788 r, err := s.draw(newStatistics(tw, s))
790789 if err != nil {
791790 t.Fatalf("tw: %d case %q draw error: %s", tw, tc.name, err.Error())
12381237 s.current = tc.current
12391238 s.trimSpace = tc.trim
12401239 s.refill = tc.refill
1241 s.completed = tc.total > 0 && tc.current >= tc.total
12421240 r, err := s.draw(newStatistics(tw, s))
12431241 if err != nil {
12441242 t.Fatalf("tw: %d case %q draw error: %s", tw, tc.name, err.Error())
14141412 s.current = tc.current
14151413 s.trimSpace = tc.trim
14161414 s.refill = tc.refill
1417 s.completed = tc.total > 0 && tc.current >= tc.total
14181415 r, err := s.draw(newStatistics(tw, s))
14191416 if err != nil {
14201417 t.Fatalf("tw: %d case %q draw error: %s", tw, tc.name, err.Error())