diff --git a/example_test.go b/example_test.go index 01ea47f..cdb6540 100644 --- a/example_test.go +++ b/example_test.go @@ -32,7 +32,7 @@ // replace ETA decorator with "done" message, OnComplete event decor.OnComplete( // ETA decorator with ewma age of 60, and width reservation of 4 - decor.ETA(decor.ET_STYLE_GO, 60, sbEta, decor.WC{W: 4}), "done", + decor.EwmaETA(decor.ET_STYLE_GO, 60, sbEta, decor.WC{W: 4}), "done", ), ), mpb.AppendDecorators(decor.Percentage()), diff --git a/examples/cancel/main.go b/examples/cancel/main.go index 5609e97..f400fbd 100644 --- a/examples/cancel/main.go +++ b/examples/cancel/main.go @@ -36,7 +36,7 @@ bar := p.AddBar(int64(total), mpb.PrependDecorators( decor.Name(name), - decor.ETA(decor.ET_STYLE_GO, 60, sbEta, decor.WCSyncSpace), + decor.EwmaETA(decor.ET_STYLE_GO, 60, sbEta, decor.WCSyncSpace), ), mpb.AppendDecorators( decor.Percentage(decor.WC{W: 5}), diff --git a/examples/complex/main.go b/examples/complex/main.go index 3181ef6..125071d 100644 --- a/examples/complex/main.go +++ b/examples/complex/main.go @@ -54,7 +54,9 @@ mpb.PrependDecorators( decor.Name(task, decor.WC{W: len(task) + 1, C: decor.DidentRight}), decor.OnComplete(decor.Name(job, decor.WCSyncSpaceR), "done!", decor.WCSyncSpaceR), - decor.OnComplete(decor.ETA(decor.ET_STYLE_MMSS, 60, sbEta, decor.WCSyncWidth), "", decor.WCSyncSpace), + decor.OnComplete( + decor.EwmaETA(decor.ET_STYLE_MMSS, 60, sbEta, decor.WCSyncWidth), "", decor.WCSyncSpace, + ), ), mpb.AppendDecorators( decor.OnComplete(decor.Percentage(decor.WC{W: 5}), ""), diff --git a/examples/io/multiple/main.go b/examples/io/multiple/main.go index 2669bc1..397fd41 100644 --- a/examples/io/multiple/main.go +++ b/examples/io/multiple/main.go @@ -59,7 +59,6 @@ } sbEta := make(chan time.Time) - sbSpeed := make(chan time.Time) // create bar with appropriate decorators bar := p.AddBar(size, mpb.BarPriority(n), mpb.PrependDecorators( @@ -67,13 +66,13 @@ decor.CountersKibiByte("%6.1f / %6.1f", decor.WCSyncWidth), ), mpb.AppendDecorators( - decor.ETA(decor.ET_STYLE_HHMMSS, 60, sbEta, decor.WCSyncWidth), - decor.SpeedKibiByte("% .2f", 60, sbSpeed, decor.WCSyncSpace), + decor.EwmaETA(decor.ET_STYLE_HHMMSS, 2048, sbEta, decor.WCSyncWidth), + decor.TotalAverageSpeed(decor.UnitKiB, "% .2f"), ), ) // create proxy reader - reader := bar.ProxyReader(resp.Body, sbEta, sbSpeed) + reader := bar.ProxyReader(resp.Body, sbEta) // and copy from reader _, err = io.Copy(dest, reader) diff --git a/examples/io/single/main.go b/examples/io/single/main.go index 34e2dcc..f56a98c 100644 --- a/examples/io/single/main.go +++ b/examples/io/single/main.go @@ -44,20 +44,19 @@ ) sbEta := make(chan time.Time) - sbSpeed := make(chan time.Time) bar := p.AddBar(size, mpb.PrependDecorators( decor.CountersKibiByte("% 6.1f / % 6.1f"), ), mpb.AppendDecorators( - decor.MovingAverageETA(decor.ET_STYLE_MMSS, decor.NewMedianEwma(300), sbEta), + decor.EwmaETA(decor.ET_STYLE_MMSS, 2048, sbEta), decor.Name(" ] "), - decor.MovingAverageSpeed(decor.UnitKiB, "% .2f", decor.NewMedianEwma(300), sbSpeed), + decor.TotalAverageSpeed(decor.UnitKiB, "% .2f"), ), ) // create proxy reader - reader := bar.ProxyReader(resp.Body, sbEta, sbSpeed) + reader := bar.ProxyReader(resp.Body, sbEta) // and copy from reader, ignoring errors io.Copy(dest, reader) diff --git a/examples/prependETA/main.go b/examples/prependETA/main.go index 6ccf829..dd8dfe0 100644 --- a/examples/prependETA/main.go +++ b/examples/prependETA/main.go @@ -31,7 +31,7 @@ mpb.PrependDecorators( decor.Name(name, decor.WCSyncWidth), decor.OnComplete( - decor.ETA(decor.ET_STYLE_MMSS, 60, sbEta, decor.WC{W: 6}), + decor.EwmaETA(decor.ET_STYLE_MMSS, 60, sbEta, decor.WC{W: 6}), "Done", decor.WCSyncSpace, ), diff --git a/examples/remove/main.go b/examples/remove/main.go index ea1a249..a0f530b 100644 --- a/examples/remove/main.go +++ b/examples/remove/main.go @@ -34,7 +34,7 @@ bOption, mpb.PrependDecorators( decor.Name(name), - decor.ETA(decor.ET_STYLE_GO, 60, sbEta, decor.WCSyncSpace), + decor.EwmaETA(decor.ET_STYLE_GO, 60, sbEta, decor.WCSyncSpace), ), mpb.AppendDecorators(decor.Percentage()), ) diff --git a/examples/simple/main.go b/examples/simple/main.go index ed28ce2..ba6ba05 100644 --- a/examples/simple/main.go +++ b/examples/simple/main.go @@ -34,7 +34,7 @@ // replace ETA decorator with "done" message, OnComplete event decor.OnComplete( // ETA decorator with ewma age of 60 - decor.ETA(decor.ET_STYLE_GO, 60, sbEta), "done", + decor.EwmaETA(decor.ET_STYLE_GO, 60, sbEta), "done", ), ), ) diff --git a/examples/singleBar/main.go b/examples/singleBar/main.go index 3e787b1..41299a4 100644 --- a/examples/singleBar/main.go +++ b/examples/singleBar/main.go @@ -29,7 +29,7 @@ // replace ETA decorator with "done" message, OnComplete event decor.OnComplete( // ETA decorator with ewma age of 60, and width reservation of 4 - decor.ETA(decor.ET_STYLE_GO, 60, sbEta, decor.WC{W: 4}), "done", + decor.EwmaETA(decor.ET_STYLE_GO, 60, sbEta, decor.WC{W: 4}), "done", ), ), mpb.AppendDecorators(decor.Percentage()), diff --git a/examples/sort/main.go b/examples/sort/main.go index 6062afb..a9744ed 100644 --- a/examples/sort/main.go +++ b/examples/sort/main.go @@ -33,7 +33,7 @@ decor.CountersNoUnit("%d / %d", decor.WCSyncSpace), ), mpb.AppendDecorators( - decor.ETA(decor.ET_STYLE_GO, 60, sbEta, decor.WC{W: 3}), + decor.EwmaETA(decor.ET_STYLE_GO, 60, sbEta, decor.WC{W: 3}), ), ) go func() { diff --git a/examples/stress/main.go b/examples/stress/main.go index 53db2da..19cb667 100644 --- a/examples/stress/main.go +++ b/examples/stress/main.go @@ -31,7 +31,7 @@ bar := p.AddBar(int64(total), mpb.PrependDecorators( decor.Name(name), - decor.ETA(decor.ET_STYLE_GO, 60, sbEta, decor.WCSyncSpace), + decor.EwmaETA(decor.ET_STYLE_GO, 60, sbEta, decor.WCSyncSpace), ), mpb.AppendDecorators( decor.Percentage(decor.WC{W: 5}),