Commit 424eb1a17506e204cb302ab5ea0a62a205870a45 - golang-github-vbauerster-mpb

ignore complete by means of SetTotal(int64, bool) should fix #48 and #63 Vladimir Bauer 6 years ago

3 changed file(s) with 14 addition(s) and 13 deletion(s). Raw diff Collapse all Expand all

-5

bar.go less more

68	68	trimSpace bool
69	69	toComplete bool
70	70	completeFlushed bool
	71	ignoreComplete bool
71	72	noPop bool
72	73	aDecorators []decor.Decorator
73	74	pDecorators []decor.Decorator

169	170	}
170	171
171	172	// SetTotal sets total dynamically.
172		// If total is less or equal to zero it takes progress' current value.
173		// If complete is true, complete event will be triggered.
	173	// If total is less than or equal to zero it takes progress' current value.
	174	// A complete flag enables or disables complete event on `current >= total`.
174	175	func (b *Bar) SetTotal(total int64, complete bool) {
175	176	select {
176	177	case b.operateState <- func(s *bState) {
	178	s.ignoreComplete = !complete
177	179	if total <= 0 {
178	180	s.total = s.current
179	181	} else {
180	182	s.total = total
181	183	}
182		if complete && !s.toComplete {
	184	if !s.ignoreComplete && !s.toComplete {
183	185	s.current = s.total
184	186	s.toComplete = true
185	187	go b.refreshTillShutdown()

196	198	s.iterated = true
197	199	s.lastN = current - s.current
198	200	s.current = current
199		if s.total > 0 && s.current >= s.total {
	201	if !s.ignoreComplete && s.current >= s.total {
200	202	s.current = s.total
201	203	s.toComplete = true
202	204	go b.refreshTillShutdown()

223	225	s.iterated = true
224	226	s.lastN = n
225	227	s.current += n
226		if s.total > 0 && s.current >= s.total {
	228	if !s.ignoreComplete && s.current >= s.total {
227	229	s.current = s.total
228	230	s.toComplete = true
229	231	go b.refreshTillShutdown()

-0

internal/percentage.go less more

6	6	if total <= 0 {
7	7	return 0
8	8	}
	9	if current >= total {
	10	return float64(width)
	11	}
9	12	return float64(int64(width)*current) / float64(total)
10	13	}
11	14

-8

internal/percentage_test.go less more