Commit 23d4934af4456c8c0f52e85dfd4cf7b7a4804d64 - golang-github-vbauerster-mpb

Fix #24 Vladimir Bauer 8 years ago

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

-5

bar.go less more

62	62	trimRightSpace bool
63	63	toComplete bool
64	64	dynamic bool
65		noBarOnComplete bool
	65	barClearOnComplete bool
	66	completeFlushed bool
66	67	startTime time.Time
67	68	blockStartTime time.Time
68	69	timeElapsed time.Duration

320	321	r = strings.NewReader(fmt.Sprintf(fmt.Sprintf("%%.%ds\n", tw), s.panicMsg))
321	322	fmt.Fprintf(debugOut, "%s %s bar id %02d %v\n", "[mpb]", time.Now(), s.id, s.panicMsg)
322	323	}
323		ch <- &bFrame{b, r, s.toComplete}
	324	ch <- &bFrame{b, r, s.toComplete && !(s.barClearOnComplete && !s.completeFlushed)}
	325	s.completeFlushed = s.toComplete
324	326	}()
325	327	r = s.draw(tw, pSyncer, aSyncer)
326	328	}:

332	334	} else {
333	335	r = s.draw(tw, pSyncer, aSyncer)
334	336	}
335		ch <- &bFrame{b, r, s.toComplete}
	337	ch <- &bFrame{b, r, true}
336	338	}
337	339	}()
338	340

360	362	prependCount := utf8.RuneCount(s.bufP.Bytes())
361	363	appendCount := utf8.RuneCount(s.bufA.Bytes())
362	364
363		if s.toComplete && s.noBarOnComplete {
	365	if s.barClearOnComplete && s.completeFlushed {
364	366	return io.MultiReader(s.bufP, s.bufA)
365	367	}
366	368

439	441	func newStatistics(s bState) decor.Statistics {
440	442	return &decor.Statistics{
441	443	ID: s.id,
442		Completed: s.toComplete,
	444	Completed: s.completeFlushed,
443	445	Total: s.total,
444	446	Current: s.current,
445	447	StartTime: s.startTime,

+12

-8

bar_option.go less more

59	59	}
60	60	}
61	61
62		// BarDynamicTotal enables dynamic total behaviour.
	62	// BarDynamicTotal is a flag, if set enables dynamic total behaviour.
	63	// If provided total <= 0, it is set implicitly.
63	64	func BarDynamicTotal() BarOption {
64	65	return func(s *bState) {
65	66	s.dynamic = true
66	67	}
67	68	}
68	69
69		// BarAutoIncrTotal auto increment total by amount, when trigger percentage remained till bar completion.
	70	// BarAutoIncrTotal auto increment total by n, when trigger percentage remained till bar completion.
70	71	// In other words: say you've set trigger = 10, then auto increment will start after bar reaches 90 %.
71		func BarAutoIncrTotal(trigger, amount int64) BarOption {
	72	// Effective only if BarDynamicTotal option is set.
	73	func BarAutoIncrTotal(trigger, n int64) BarOption {
72	74	return func(s *bState) {
73		s.dynamic = true
74	75	s.totalAutoIncrTrigger = trigger
75		s.totalAutoIncrBy = amount
	76	s.totalAutoIncrBy = n
76	77	}
77	78	}
78	79
79		// BarRemoveOnComplete is a flag, which will trigger bar auto remove on completion event.
	80	// BarRemoveOnComplete is a flag, if set whole bar line will be removed on complete event.
	81	// If both BarRemoveOnComplete and BarClearOnComplete are set, first bar section gets cleared
	82	// and then whole bar line gets removed completely.
80	83	func BarRemoveOnComplete() BarOption {
81	84	return func(s *bState) {
82	85	s.removeOnComplete = true

91	94	}
92	95	}
93	96
94		// BarClearOnComplete clears the bar section on complete event.
	97	// BarClearOnComplete is a flag, if set will clear bar section on complete event.
	98	// If you need to remove a whole bar line, refer to BarRemoveOnComplete.
95	99	func BarClearOnComplete() BarOption {
96	100	return func(s *bState) {
97		s.noBarOnComplete = true
	101	s.barClearOnComplete = true
98	102	}
99	103	}
100	104