Commit cf590a3f8e327d930457f209d6a640de2a0234b2 - golang-github-vbauerster-mpb

refactoring: startTime to start Vladimir Bauer 1 year, 10 months ago

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

-7

decor/eta.go less more

104	104	//
105	105	// `style` one of [ET_STYLE_GO\|ET_STYLE_HHMMSS\|ET_STYLE_HHMM\|ET_STYLE_MMSS]
106	106	//
107		// `startTime` start time
	107	// `start` start time
108	108	//
109	109	// `normalizer` available implementations are [FixedIntervalTimeNormalizer\|MaxTolerateTimeNormalizer]
110	110	//
111	111	// `wcc` optional WC config
112		func NewAverageETA(style TimeStyle, startTime time.Time, normalizer TimeNormalizer, wcc ...WC) Decorator {
	112	func NewAverageETA(style TimeStyle, start time.Time, normalizer TimeNormalizer, wcc ...WC) Decorator {
113	113	d := &averageETA{
114	114	WC: initWC(wcc...),
115		startTime: startTime,
	115	start: start,
116	116	normalizer: normalizer,
117	117	producer: chooseTimeProducer(style),
118	118	}

121	121
122	122	type averageETA struct {
123	123	WC
124		startTime time.Time
	124	start time.Time
125	125	normalizer TimeNormalizer
126	126	producer func(time.Duration) string
127	127	}

129	129	func (d *averageETA) Decor(s Statistics) (string, int) {
130	130	var remaining time.Duration
131	131	if s.Current != 0 {
132		durPerItem := float64(time.Since(d.startTime)) / float64(s.Current)
	132	durPerItem := float64(time.Since(d.start)) / float64(s.Current)
133	133	durPerItem = math.Round(durPerItem)
134	134	remaining = time.Duration((s.Total - s.Current) * int64(durPerItem))
135	135	if d.normalizer != nil {

139	139	return d.Format(d.producer(remaining))
140	140	}
141	141
142		func (d *averageETA) AverageAdjust(startTime time.Time) {
143		d.startTime = startTime
	142	func (d *averageETA) AverageAdjust(start time.Time) {
	143	d.start = start
144	144	}
145	145
146	146	// MaxTolerateTimeNormalizer returns implementation of TimeNormalizer.

+11

-11

decor/speed.go less more

119	119	//
120	120	// `format` printf compatible verb for value, like "%f" or "%d"
121	121	//
122		// `startTime` start time
	122	// `start` start time
123	123	//
124	124	// `wcc` optional WC config
125	125	//

129	129	// unit=SizeB1024(0), format="% .1f" output: "1.0 MiB/s"
130	130	// unit=SizeB1000(0), format="%.1f" output: "1.0MB/s"
131	131	// unit=SizeB1000(0), format="% .1f" output: "1.0 MB/s"
132		func NewAverageSpeed(unit interface{}, format string, startTime time.Time, wcc ...WC) Decorator {
	132	func NewAverageSpeed(unit interface{}, format string, start time.Time, wcc ...WC) Decorator {
133	133	d := &averageSpeed{
134		WC: initWC(wcc...),
135		startTime: startTime,
136		producer: chooseSpeedProducer(unit, format),
	134	WC: initWC(wcc...),
	135	start: start,
	136	producer: chooseSpeedProducer(unit, format),
137	137	}
138	138	return d
139	139	}
140	140
141	141	type averageSpeed struct {
142	142	WC
143		startTime time.Time
144		producer func(float64) string
145		msg string
	143	start time.Time
	144	producer func(float64) string
	145	msg string
146	146	}
147	147
148	148	func (d *averageSpeed) Decor(s Statistics) (string, int) {
149	149	if !s.Completed {
150		speed := float64(s.Current) / float64(time.Since(d.startTime))
	150	speed := float64(s.Current) / float64(time.Since(d.start))
151	151	d.msg = d.producer(speed * 1e9)
152	152	}
153	153	return d.Format(d.msg)
154	154	}
155	155
156		func (d *averageSpeed) AverageAdjust(startTime time.Time) {
157		d.startTime = startTime
	156	func (d *averageSpeed) AverageAdjust(start time.Time) {
	157	d.start = start
158	158	}
159	159
160	160	func chooseSpeedProducer(unit interface{}, format string) func(float64) string {