diff --git a/.travis.yml b/.travis.yml
index c982d1f..f166a12 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,12 @@
language: go
-sudo: false
+
go:
- 1.10.x
- - tip
+ - 1.11.x
-before_install:
- - go get -t -v ./...
+env:
+ - GO111MODULE=on
script:
- - go test -race -coverprofile=coverage.txt -covermode=atomic
-
-after_success:
- - bash <(curl -s https://codecov.io/bash)
+ - go test -race -timeout 10s ./...
+ - for i in _examples/*/; do go build $i/*.go || exit 1; done
diff --git a/README.md b/README.md
index f96857c..995d5c8 100644
--- a/README.md
+++ b/README.md
@@ -16,30 +16,29 @@
* __Predefined Decorators__: Elapsed time, [ewma](https://github.com/VividCortex/ewma) based ETA, Percentage, Bytes counter
* __Decorator's width sync__: Synchronized decorator's width among multiple bars
-## Installation
-
-```sh
-go get github.com/vbauerster/mpb
-```
-
-_Note:_ it is preferable to go get from github.com, rather than gopkg.in. See issue [#11](https://github.com/vbauerster/mpb/issues/11).
-
## Usage
-#### [Rendering single bar](examples/singleBar/main.go)
+#### [Rendering single bar](_examples/singleBar/main.go)
```go
- p := mpb.New(
- // override default (80) width
- mpb.WithWidth(64),
- // override default 120ms refresh rate
- mpb.WithRefreshRate(180*time.Millisecond),
- )
+package main
+
+import (
+ "math/rand"
+ "time"
+
+ "github.com/vbauerster/mpb/v4"
+ "github.com/vbauerster/mpb/v4/decor"
+)
+
+func main() {
+ // initialize progress container, with custom width
+ p := mpb.New(mpb.WithWidth(64))
total := 100
name := "Single Bar:"
- // adding a single bar
+ // adding a single bar, which will inherit container's width
bar := p.AddBar(int64(total),
- // override default "[=>-]" style
+ // set custom bar style, default one is "[=>-]"
mpb.BarStyle("╢▌▌░╟"),
mpb.PrependDecorators(
// display our name with one space on the right
@@ -62,11 +61,13 @@
}
// wait for our bar to complete and flush
p.Wait()
+}
```
-#### [Rendering multiple bars](examples/simple/main.go)
+#### [Rendering multiple bars](_examples/simple/main.go)
```go
var wg sync.WaitGroup
+ // pass &wg (optional), so p will wait for it eventually
p := mpb.New(mpb.WithWaitGroup(&wg))
total, numBars := 100, 3
wg.Add(numBars)
@@ -100,18 +101,18 @@
}
}()
}
- // wait for all bars to complete and flush
+ // Waiting for passed &wg and for all bars to complete and flush
p.Wait()
```
-#### [Dynamic total](examples/dynTotal/main.go)
+#### [Dynamic total](_examples/dynTotal/main.go)
-
+
-#### [Complex example](examples/complex/main.go)
+#### [Complex example](_examples/complex/main.go)
-
+
-#### [Bytes counters](examples/io/single/main.go)
+#### [Bytes counters](_examples/io/single/main.go)
-
+
diff --git a/_examples/barNewLineExtend/main.go b/_examples/barNewLineExtend/main.go
new file mode 100644
index 0000000..7b4b1c8
--- /dev/null
+++ b/_examples/barNewLineExtend/main.go
@@ -0,0 +1,60 @@
+package main
+
+import (
+ "fmt"
+ "io"
+ "math/rand"
+ "sync"
+ "time"
+
+ "github.com/vbauerster/mpb/v4"
+ "github.com/vbauerster/mpb/v4/decor"
+)
+
+func init() {
+ rand.Seed(time.Now().UnixNano())
+}
+
+func main() {
+ var wg sync.WaitGroup
+ p := mpb.New(mpb.WithWaitGroup(&wg))
+ total, numBars := 100, 3
+ wg.Add(numBars)
+
+ for i := 0; i < numBars; i++ {
+ name := fmt.Sprintf("Bar#%d:", i)
+ efn := func(w io.Writer, s *decor.Statistics) {
+ if s.Completed {
+ fmt.Fprintf(w, "Bar id: %d has been completed\n", s.ID)
+ }
+ }
+ bar := p.AddBar(int64(total), mpb.BarNewLineExtend(efn),
+ mpb.PrependDecorators(
+ // simple name decorator
+ decor.Name(name),
+ // decor.DSyncWidth bit enables column width synchronization
+ decor.Percentage(decor.WCSyncSpace),
+ ),
+ mpb.AppendDecorators(
+ // replace ETA decorator with "done" message, OnComplete event
+ decor.OnComplete(
+ // ETA decorator with ewma age of 60
+ decor.EwmaETA(decor.ET_STYLE_GO, 60), "done",
+ ),
+ ),
+ )
+ // simulating some work
+ go func() {
+ defer wg.Done()
+ max := 100 * time.Millisecond
+ for i := 0; i < total; i++ {
+ start := time.Now()
+ time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
+ // ewma based decorators require work duration measurement
+ bar.IncrBy(1, time.Since(start))
+ }
+ }()
+ }
+ // wait for all bars to complete and flush
+ p.Wait()
+}
diff --git a/_examples/cancel/main.go b/_examples/cancel/main.go
new file mode 100644
index 0000000..9da8ed3
--- /dev/null
+++ b/_examples/cancel/main.go
@@ -0,0 +1,56 @@
+package main
+
+import (
+ "context"
+ "fmt"
+ "math/rand"
+ "sync"
+ "time"
+
+ "github.com/vbauerster/mpb"
+ "github.com/vbauerster/mpb/decor"
+)
+
+func init() {
+ rand.Seed(time.Now().UnixNano())
+}
+
+func main() {
+ ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+ defer cancel()
+
+ var wg sync.WaitGroup
+ p := mpb.New(
+ mpb.WithWaitGroup(&wg),
+ mpb.WithContext(ctx),
+ )
+ total := 300
+ numBars := 3
+ wg.Add(numBars)
+
+ for i := 0; i < numBars; i++ {
+ name := fmt.Sprintf("Bar#%d:", i)
+ bar := p.AddBar(int64(total),
+ mpb.PrependDecorators(
+ decor.Name(name),
+ decor.EwmaETA(decor.ET_STYLE_GO, 60, decor.WCSyncSpace),
+ ),
+ mpb.AppendDecorators(
+ decor.Percentage(decor.WC{W: 5}),
+ ),
+ )
+
+ go func() {
+ defer wg.Done()
+ max := 100 * time.Millisecond
+ for !bar.Completed() {
+ start := time.Now()
+ time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
+ // ewma based decorators require work duration measurement
+ bar.IncrBy(1, time.Since(start))
+ }
+ }()
+ }
+
+ p.Wait()
+}
diff --git a/_examples/complex/main.go b/_examples/complex/main.go
new file mode 100644
index 0000000..e13bbc4
--- /dev/null
+++ b/_examples/complex/main.go
@@ -0,0 +1,79 @@
+package main
+
+import (
+ "fmt"
+ "math/rand"
+ "sync"
+ "time"
+
+ "github.com/vbauerster/mpb/v4"
+ "github.com/vbauerster/mpb/v4/decor"
+)
+
+func init() {
+ rand.Seed(time.Now().UnixNano())
+}
+
+func main() {
+ doneWg := new(sync.WaitGroup)
+ p := mpb.New(mpb.WithWidth(64), mpb.WithWaitGroup(doneWg))
+ numBars := 4
+
+ var bars []*mpb.Bar
+ var downloadWgg []*sync.WaitGroup
+ for i := 0; i < numBars; i++ {
+ wg := new(sync.WaitGroup)
+ wg.Add(1)
+ downloadWgg = append(downloadWgg, wg)
+ task := fmt.Sprintf("Task#%02d:", i)
+ job := "downloading"
+ b := p.AddBar(rand.Int63n(201)+100,
+ mpb.BarRemoveOnComplete(),
+ mpb.PrependDecorators(
+ decor.Name(task, decor.WC{W: len(task) + 1, C: decor.DidentRight}),
+ decor.Name(job, decor.WCSyncSpaceR),
+ decor.CountersNoUnit("%d / %d", decor.WCSyncWidth),
+ ),
+ mpb.AppendDecorators(decor.Percentage(decor.WC{W: 5})),
+ )
+ go newTask(wg, b, i+1)
+ bars = append(bars, b)
+ }
+
+ for i := 0; i < numBars; i++ {
+ doneWg.Add(1)
+ i := i
+ go func() {
+ task := fmt.Sprintf("Task#%02d:", i)
+ job := "installing"
+ // preparing delayed bars
+ b := p.AddBar(rand.Int63n(101)+100,
+ mpb.BarReplaceOnComplete(bars[i]),
+ mpb.BarClearOnComplete(),
+ mpb.PrependDecorators(
+ decor.Name(task, decor.WC{W: len(task) + 1, C: decor.DidentRight}),
+ decor.OnComplete(decor.Name(job, decor.WCSyncSpaceR), "done!"),
+ decor.OnComplete(decor.EwmaETA(decor.ET_STYLE_MMSS, 60, decor.WCSyncWidth), "")),
+ mpb.AppendDecorators(
+ decor.OnComplete(decor.Percentage(decor.WC{W: 5}), ""),
+ ),
+ )
+ // waiting for download to complete, before starting install job
+ downloadWgg[i].Wait()
+ go newTask(doneWg, b, numBars-i)
+ }()
+ }
+
+ p.Wait()
+}
+
+func newTask(wg *sync.WaitGroup, b *mpb.Bar, incrBy int) {
+ defer wg.Done()
+ max := 100 * time.Millisecond
+ for !b.Completed() {
+ start := time.Now()
+ time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
+ // ewma based decorators require work duration measurement
+ b.IncrBy(incrBy, time.Since(start))
+ }
+}
diff --git a/_examples/differentWidth/main.go b/_examples/differentWidth/main.go
new file mode 100644
index 0000000..9171a68
--- /dev/null
+++ b/_examples/differentWidth/main.go
@@ -0,0 +1,60 @@
+package main
+
+import (
+ "fmt"
+ "math/rand"
+ "sync"
+ "time"
+
+ "github.com/vbauerster/mpb/v4"
+ "github.com/vbauerster/mpb/v4/decor"
+)
+
+func init() {
+ rand.Seed(time.Now().UnixNano())
+}
+
+func main() {
+ var wg sync.WaitGroup
+ p := mpb.New(
+ mpb.WithWaitGroup(&wg),
+ // container's width.
+ mpb.WithWidth(60),
+ )
+ total, numBars := 100, 3
+ wg.Add(numBars)
+
+ for i := 0; i < numBars; i++ {
+ name := fmt.Sprintf("Bar#%d:", i)
+ bar := p.AddBar(int64(total),
+ // set BarWidth 40 for bar 1 and 2
+ mpb.OptionOnCondition(mpb.BarWidth(40), func() bool { return i > 0 }),
+ mpb.PrependDecorators(
+ // simple name decorator
+ decor.Name(name),
+ // decor.DSyncWidth bit enables column width synchronization
+ decor.Percentage(decor.WCSyncSpace),
+ ),
+ mpb.AppendDecorators(
+ // replace ETA decorator with "done" message, OnComplete event
+ decor.OnComplete(
+ // ETA decorator with ewma age of 60
+ decor.EwmaETA(decor.ET_STYLE_GO, 60), "done",
+ ),
+ ),
+ )
+ // simulating some work
+ go func() {
+ defer wg.Done()
+ max := 100 * time.Millisecond
+ for i := 0; i < total; i++ {
+ start := time.Now()
+ time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
+ // ewma based decorators require work duration measurement
+ bar.IncrBy(1, time.Since(start))
+ }
+ }()
+ }
+ // wait for all bars to complete and flush
+ p.Wait()
+}
diff --git a/_examples/dynTotal/main.go b/_examples/dynTotal/main.go
new file mode 100644
index 0000000..d7d39c8
--- /dev/null
+++ b/_examples/dynTotal/main.go
@@ -0,0 +1,52 @@
+package main
+
+import (
+ "io"
+ "math/rand"
+ "time"
+
+ "github.com/vbauerster/mpb/v4"
+ "github.com/vbauerster/mpb/v4/decor"
+)
+
+func init() {
+ rand.Seed(time.Now().UnixNano())
+}
+
+func main() {
+ p := mpb.New(mpb.WithWidth(64))
+
+ var total int64
+ bar := p.AddBar(total,
+ mpb.PrependDecorators(decor.Counters(decor.UnitKiB, "% .1f / % .1f")),
+ mpb.AppendDecorators(decor.Percentage()),
+ )
+
+ maxSleep := 100 * time.Millisecond
+ read := makeStream(200)
+ for {
+ n, err := read()
+ total += int64(n)
+ time.Sleep(time.Duration(rand.Intn(10)+1) * maxSleep / 10)
+ bar.IncrBy(n)
+ if err == io.EOF {
+ // total is known, final=true
+ bar.SetTotal(total, true)
+ break
+ }
+ // total is unknown, final=false
+ bar.SetTotal(total+2048, false)
+ }
+
+ p.Wait()
+}
+
+func makeStream(limit int) func() (int, error) {
+ return func() (int, error) {
+ if limit <= 0 {
+ return 0, io.EOF
+ }
+ limit--
+ return rand.Intn(1024) + 1, nil
+ }
+}
diff --git a/_examples/io/multiple/main.go b/_examples/io/multiple/main.go
new file mode 100644
index 0000000..1d0a6a6
--- /dev/null
+++ b/_examples/io/multiple/main.go
@@ -0,0 +1,83 @@
+package main
+
+import (
+ "fmt"
+ "io"
+ "log"
+ "net/http"
+ "os"
+ "path/filepath"
+ "sync"
+
+ "github.com/vbauerster/mpb/v4"
+ "github.com/vbauerster/mpb/v4/decor"
+)
+
+func main() {
+ log.SetOutput(os.Stderr)
+
+ url1 := "https://homebrew.bintray.com/bottles/youtube-dl-2016.12.12.sierra.bottle.tar.gz"
+ url2 := "https://homebrew.bintray.com/bottles/libtiff-4.0.7.sierra.bottle.tar.gz"
+
+ var wg sync.WaitGroup
+ p := mpb.New(mpb.WithWidth(64), mpb.WithWaitGroup(&wg))
+
+ for i, url := range [...]string{url1, url2} {
+ wg.Add(1)
+ name := fmt.Sprintf("url%d:", i+1)
+ go download(&wg, p, name, url, i)
+ }
+
+ p.Wait()
+}
+
+func download(wg *sync.WaitGroup, p *mpb.Progress, name, url string, n int) {
+ defer wg.Done()
+ resp, err := http.Get(url)
+ if err != nil {
+ log.Printf("%s: %v", name, err)
+ return
+ }
+ defer resp.Body.Close()
+
+ if resp.StatusCode != http.StatusOK {
+ err = fmt.Errorf("non-200 status: %s", resp.Status)
+ log.Printf("%s: %v", name, err)
+ return
+ }
+
+ size := resp.ContentLength
+
+ // create dest
+ destName := filepath.Base(url)
+ dest, err := os.Create(destName)
+ if err != nil {
+ err = fmt.Errorf("Can't create %s: %v", destName, err)
+ log.Printf("%s: %v", name, err)
+ return
+ }
+
+ // create bar with appropriate decorators
+ bar := p.AddBar(size, mpb.BarPriority(n),
+ mpb.PrependDecorators(
+ decor.Name(name, decor.WC{W: len(name) + 1, C: decor.DidentRight}),
+ decor.CountersKibiByte("%6.1f / %6.1f", decor.WCSyncWidth),
+ ),
+ mpb.AppendDecorators(
+ decor.EwmaETA(decor.ET_STYLE_HHMMSS, 1024*4, decor.WCSyncWidth),
+ decor.AverageSpeed(decor.UnitKiB, "% .2f"),
+ ),
+ )
+
+ // create proxy reader
+ reader := bar.ProxyReader(resp.Body)
+ // and copy from reader
+ _, err = io.Copy(dest, reader)
+
+ if e := dest.Close(); err == nil {
+ err = e
+ }
+ if err != nil {
+ log.Printf("%s: %v", name, err)
+ }
+}
diff --git a/_examples/io/single/main.go b/_examples/io/single/main.go
new file mode 100644
index 0000000..6413b2c
--- /dev/null
+++ b/_examples/io/single/main.go
@@ -0,0 +1,63 @@
+package main
+
+import (
+ "fmt"
+ "io"
+ "net/http"
+ "os"
+ "path/filepath"
+ "time"
+
+ "github.com/vbauerster/mpb/v4"
+ "github.com/vbauerster/mpb/v4/decor"
+)
+
+func main() {
+ url := "https://github.com/onivim/oni/releases/download/v0.3.4/Oni-0.3.4-amd64-linux.deb"
+
+ resp, err := http.Get(url)
+ if err != nil {
+ panic(err)
+ }
+ defer resp.Body.Close()
+
+ if resp.StatusCode != http.StatusOK {
+ fmt.Printf("Server return non-200 status: %s\n", resp.Status)
+ return
+ }
+
+ size := resp.ContentLength
+
+ // create dest
+ destName := filepath.Base(url)
+ dest, err := os.Create(destName)
+ if err != nil {
+ fmt.Printf("Can't create %s: %v\n", destName, err)
+ return
+ }
+ defer dest.Close()
+
+ p := mpb.New(
+ mpb.WithWidth(60),
+ mpb.WithRefreshRate(180*time.Millisecond),
+ )
+
+ bar := p.AddBar(size, mpb.BarStyle("[=>-|"),
+ mpb.PrependDecorators(
+ decor.CountersKibiByte("% 6.1f / % 6.1f"),
+ ),
+ mpb.AppendDecorators(
+ decor.EwmaETA(decor.ET_STYLE_MMSS, float64(size)/2048),
+ decor.Name(" ] "),
+ decor.AverageSpeed(decor.UnitKiB, "% .2f"),
+ ),
+ )
+
+ // create proxy reader
+ reader := bar.ProxyReader(resp.Body)
+
+ // and copy from reader, ignoring errors
+ io.Copy(dest, reader)
+
+ p.Wait()
+}
diff --git a/_examples/panic/main.go b/_examples/panic/main.go
new file mode 100644
index 0000000..2a1fed4
--- /dev/null
+++ b/_examples/panic/main.go
@@ -0,0 +1,57 @@
+package main
+
+import (
+ "fmt"
+ "os"
+ "sync"
+ "time"
+
+ "github.com/vbauerster/mpb/v4"
+ "github.com/vbauerster/mpb/v4/decor"
+)
+
+func main() {
+ var wg sync.WaitGroup
+ p := mpb.New(mpb.WithWaitGroup(&wg), mpb.WithDebugOutput(os.Stderr))
+
+ wantPanic := "Some really long panic panic panic panic panic panic panic, really it is very long"
+ numBars := 3
+ wg.Add(numBars)
+
+ for i := 0; i < numBars; i++ {
+ name := fmt.Sprintf("b#%02d:", i)
+ bar := p.AddBar(100, mpb.BarID(i), mpb.PrependDecorators(panicDecorator(name, wantPanic)))
+
+ go func() {
+ defer wg.Done()
+ for i := 0; i < 100; i++ {
+ time.Sleep(50 * time.Millisecond)
+ bar.Increment()
+ }
+ }()
+ }
+
+ p.Wait()
+}
+
+func panicDecorator(name, panicMsg string) decor.Decorator {
+ d := &decorator{
+ msg: name,
+ panicMsg: panicMsg,
+ }
+ d.Init()
+ return d
+}
+
+type decorator struct {
+ decor.WC
+ msg string
+ panicMsg string
+}
+
+func (d *decorator) Decor(st *decor.Statistics) string {
+ if st.ID == 1 && st.Current >= 42 {
+ panic(d.panicMsg)
+ }
+ return d.FormatMsg(d.msg)
+}
diff --git a/_examples/remove/main.go b/_examples/remove/main.go
new file mode 100644
index 0000000..38dd8af
--- /dev/null
+++ b/_examples/remove/main.go
@@ -0,0 +1,51 @@
+package main
+
+import (
+ "fmt"
+ "math/rand"
+ "sync"
+ "time"
+
+ "github.com/vbauerster/mpb/v4"
+ "github.com/vbauerster/mpb/v4/decor"
+)
+
+func init() {
+ rand.Seed(time.Now().UnixNano())
+}
+
+func main() {
+ var wg sync.WaitGroup
+ p := mpb.New(mpb.WithWaitGroup(&wg))
+ total := 100
+ numBars := 3
+ wg.Add(numBars)
+
+ for i := 0; i < numBars; i++ {
+ name := fmt.Sprintf("Bar#%d:", i)
+ b := p.AddBar(int64(total), mpb.BarID(i),
+ mpb.OptionOnCondition(mpb.BarRemoveOnComplete(), func() bool { return i == 0 }),
+ mpb.PrependDecorators(
+ decor.Name(name),
+ decor.EwmaETA(decor.ET_STYLE_GO, 60, decor.WCSyncSpace),
+ ),
+ mpb.AppendDecorators(decor.Percentage()),
+ )
+ go func() {
+ defer wg.Done()
+ max := 100 * time.Millisecond
+ for i := 0; i < total; i++ {
+ start := time.Now()
+ if b.ID() == 2 && i == 42 {
+ p.Abort(b, true)
+ return
+ }
+ time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
+ // ewma based decorators require work duration measurement
+ b.IncrBy(1, time.Since(start))
+ }
+ }()
+ }
+
+ p.Wait()
+}
diff --git a/_examples/simple/main.go b/_examples/simple/main.go
new file mode 100644
index 0000000..790a174
--- /dev/null
+++ b/_examples/simple/main.go
@@ -0,0 +1,55 @@
+package main
+
+import (
+ "fmt"
+ "math/rand"
+ "sync"
+ "time"
+
+ "github.com/vbauerster/mpb/v4"
+ "github.com/vbauerster/mpb/v4/decor"
+)
+
+func init() {
+ rand.Seed(time.Now().UnixNano())
+}
+
+func main() {
+ var wg sync.WaitGroup
+ // pass &wg (optional), so p will wait for it eventually
+ p := mpb.New(mpb.WithWaitGroup(&wg))
+ total, numBars := 100, 3
+ wg.Add(numBars)
+
+ for i := 0; i < numBars; i++ {
+ name := fmt.Sprintf("Bar#%d:", i)
+ bar := p.AddBar(int64(total),
+ mpb.PrependDecorators(
+ // simple name decorator
+ decor.Name(name),
+ // decor.DSyncWidth bit enables column width synchronization
+ decor.Percentage(decor.WCSyncSpace),
+ ),
+ mpb.AppendDecorators(
+ // replace ETA decorator with "done" message, OnComplete event
+ decor.OnComplete(
+ // ETA decorator with ewma age of 60
+ decor.EwmaETA(decor.ET_STYLE_GO, 60), "done",
+ ),
+ ),
+ )
+ // simulating some work
+ go func() {
+ defer wg.Done()
+ max := 100 * time.Millisecond
+ for i := 0; i < total; i++ {
+ start := time.Now()
+ time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
+ // ewma based decorators require work duration measurement
+ bar.IncrBy(1, time.Since(start))
+ }
+ }()
+ }
+ // Waiting for passed &wg and for all bars to complete and flush
+ p.Wait()
+}
diff --git a/_examples/singleBar/main.go b/_examples/singleBar/main.go
new file mode 100644
index 0000000..a7a6a13
--- /dev/null
+++ b/_examples/singleBar/main.go
@@ -0,0 +1,42 @@
+package main
+
+import (
+ "math/rand"
+ "time"
+
+ "github.com/vbauerster/mpb/v4"
+ "github.com/vbauerster/mpb/v4/decor"
+)
+
+func main() {
+ // initialize progress container, with custom width
+ p := mpb.New(mpb.WithWidth(64))
+
+ total := 100
+ name := "Single Bar:"
+ // adding a single bar, which will inherit container's width
+ bar := p.AddBar(int64(total),
+ // set custom bar style, default one is "[=>-]"
+ mpb.BarStyle("╢▌▌░╟"),
+ mpb.PrependDecorators(
+ // display our name with one space on the right
+ decor.Name(name, decor.WC{W: len(name) + 1, C: decor.DidentRight}),
+ // replace ETA decorator with "done" message, OnComplete event
+ decor.OnComplete(
+ // ETA decorator with ewma age of 60, and width reservation of 4
+ decor.EwmaETA(decor.ET_STYLE_GO, 60, decor.WC{W: 4}), "done",
+ ),
+ ),
+ mpb.AppendDecorators(decor.Percentage()),
+ )
+ // simulating some work
+ max := 100 * time.Millisecond
+ for i := 0; i < total; i++ {
+ start := time.Now()
+ time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
+ // ewma based decorators require work duration measurement
+ bar.IncrBy(1, time.Since(start))
+ }
+ // wait for our bar to complete and flush
+ p.Wait()
+}
diff --git a/_examples/sort/main.go b/_examples/sort/main.go
new file mode 100644
index 0000000..210591a
--- /dev/null
+++ b/_examples/sort/main.go
@@ -0,0 +1,55 @@
+package main
+
+import (
+ "fmt"
+ "math/rand"
+ "sync"
+ "time"
+
+ "github.com/vbauerster/mpb/v4"
+ "github.com/vbauerster/mpb/v4/decor"
+)
+
+func init() {
+ rand.Seed(time.Now().UnixNano())
+}
+
+func main() {
+ var wg sync.WaitGroup
+ p := mpb.New(mpb.WithWaitGroup(&wg))
+ total := 100
+ numBars := 3
+ wg.Add(numBars)
+
+ for i := 0; i < numBars; i++ {
+ var name string
+ if i != 1 {
+ name = fmt.Sprintf("Bar#%d:", i)
+ }
+ b := p.AddBar(int64(total),
+ mpb.PrependDecorators(
+ decor.Name(name, decor.WCSyncWidth),
+ decor.CountersNoUnit("%d / %d", decor.WCSyncSpace),
+ ),
+ mpb.AppendDecorators(
+ decor.EwmaETA(decor.ET_STYLE_GO, 60, decor.WC{W: 3}),
+ ),
+ )
+ go func() {
+ defer wg.Done()
+ max := 100 * time.Millisecond
+ for i := 0; i < total; i++ {
+ start := time.Now()
+ time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
+ if i&1 == 1 {
+ priority := total - int(b.Current())
+ p.UpdateBarPriority(b, priority)
+ }
+ // ewma based decorators require work duration measurement
+ b.IncrBy(1, time.Since(start))
+ }
+ }()
+ }
+
+ p.Wait()
+}
diff --git a/_examples/spinner/main.go b/_examples/spinner/main.go
new file mode 100644
index 0000000..fc28755
--- /dev/null
+++ b/_examples/spinner/main.go
@@ -0,0 +1,77 @@
+package main
+
+import (
+ "fmt"
+ "math/rand"
+ "sync"
+ "time"
+
+ "github.com/vbauerster/mpb/v4"
+ "github.com/vbauerster/mpb/v4/decor"
+)
+
+func init() {
+ rand.Seed(time.Now().UnixNano())
+}
+
+func main() {
+ var wg sync.WaitGroup
+ p := mpb.New(
+ mpb.WithWaitGroup(&wg),
+ mpb.WithWidth(13),
+ )
+ total, numBars := 101, 3
+ wg.Add(numBars)
+
+ for i := 0; i < numBars; i++ {
+ name := fmt.Sprintf("Bar#%d:", i)
+ var bar *mpb.Bar
+ if i == 0 {
+ bar = p.AddBar(int64(total),
+ // set custom bar style, default one is "[=>-]"
+ mpb.BarStyle("╢▌▌░╟"),
+ mpb.PrependDecorators(
+ // simple name decorator
+ decor.Name(name),
+ ),
+ mpb.AppendDecorators(
+ // replace ETA decorator with "done" message, OnComplete event
+ decor.OnComplete(
+ // ETA decorator with ewma age of 60
+ decor.EwmaETA(decor.ET_STYLE_GO, 60), "done",
+ ),
+ ),
+ )
+ } else {
+ bar = p.AddSpinner(int64(total), mpb.SpinnerOnMiddle,
+ // set custom spinner style, default one is {"⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"}
+ mpb.SpinnerStyle([]string{"∙∙∙", "●∙∙", "∙●∙", "∙∙●", "∙∙∙"}),
+ mpb.PrependDecorators(
+ // simple name decorator
+ decor.Name(name),
+ ),
+ mpb.AppendDecorators(
+ // replace ETA decorator with "done" message, OnComplete event
+ decor.OnComplete(
+ // ETA decorator with ewma age of 60
+ decor.EwmaETA(decor.ET_STYLE_GO, 60), "done",
+ ),
+ ),
+ )
+ }
+
+ // simulating some work
+ go func() {
+ defer wg.Done()
+ max := 100 * time.Millisecond
+ for i := 0; i < total; i++ {
+ start := time.Now()
+ time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
+ // ewma based decorators require work duration measurement
+ bar.IncrBy(1, time.Since(start))
+ }
+ }()
+ }
+ // wait for all bars to complete and flush
+ p.Wait()
+}
diff --git a/_examples/stress/main.go b/_examples/stress/main.go
new file mode 100644
index 0000000..884e023
--- /dev/null
+++ b/_examples/stress/main.go
@@ -0,0 +1,55 @@
+package main
+
+import (
+ "fmt"
+ "math/rand"
+ "sync"
+ "time"
+
+ "github.com/vbauerster/mpb/v4"
+ "github.com/vbauerster/mpb/v4/decor"
+)
+
+const (
+ totalBars = 32
+)
+
+func init() {
+ rand.Seed(time.Now().UnixNano())
+}
+
+func main() {
+ var wg sync.WaitGroup
+ p := mpb.New(
+ mpb.WithWaitGroup(&wg),
+ mpb.WithRefreshRate(50*time.Millisecond),
+ )
+ wg.Add(totalBars)
+
+ for i := 0; i < totalBars; i++ {
+ name := fmt.Sprintf("Bar#%02d: ", i)
+ total := rand.Intn(320) + 10
+ bar := p.AddBar(int64(total),
+ mpb.PrependDecorators(
+ decor.Name(name),
+ decor.EwmaETA(decor.ET_STYLE_GO, 60, decor.WCSyncSpace),
+ ),
+ mpb.AppendDecorators(
+ decor.Percentage(decor.WC{W: 5}),
+ ),
+ )
+
+ go func() {
+ defer wg.Done()
+ max := 100 * time.Millisecond
+ for !bar.Completed() {
+ start := time.Now()
+ time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
+ // ewma based decorators require work duration measurement
+ bar.IncrBy(1, time.Since(start))
+ }
+ }()
+ }
+
+ p.Wait()
+}
diff --git a/_svg/godEMrCZmJkHYH1X9dN4Nm0U7.svg b/_svg/godEMrCZmJkHYH1X9dN4Nm0U7.svg
new file mode 100644
index 0000000..f794408
--- /dev/null
+++ b/_svg/godEMrCZmJkHYH1X9dN4Nm0U7.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/_svg/hIpTa3A5rQz65ssiVuRJu87X6.svg b/_svg/hIpTa3A5rQz65ssiVuRJu87X6.svg
new file mode 100644
index 0000000..163921c
--- /dev/null
+++ b/_svg/hIpTa3A5rQz65ssiVuRJu87X6.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/_svg/wHzf1M7sd7B3zVa2scBMnjqRf.svg b/_svg/wHzf1M7sd7B3zVa2scBMnjqRf.svg
new file mode 100644
index 0000000..9e3b871
--- /dev/null
+++ b/_svg/wHzf1M7sd7B3zVa2scBMnjqRf.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/example_test.go b/example_test.go
index 2f4f9d3..2216fe9 100644
--- a/example_test.go
+++ b/example_test.go
@@ -7,23 +7,19 @@
"net/http"
"time"
- "github.com/vbauerster/mpb"
- "github.com/vbauerster/mpb/decor"
+ "github.com/vbauerster/mpb/v4"
+ "github.com/vbauerster/mpb/v4/decor"
)
func Example() {
- p := mpb.New(
- // override default (80) width
- mpb.WithWidth(64),
- // override default 120ms refresh rate
- mpb.WithRefreshRate(180*time.Millisecond),
- )
+ // initialize progress container, with custom width
+ p := mpb.New(mpb.WithWidth(64))
total := 100
name := "Single Bar:"
- // adding a single bar
+ // adding a single bar, which will inherit container's width
bar := p.AddBar(int64(total),
- // override default "[=>-]" style
+ // set custom bar style, default one is "[=>-]"
mpb.BarStyle("╢▌▌░╟"),
mpb.PrependDecorators(
// display our name with one space on the right
diff --git a/examples/barNewLineExtend/main.go b/examples/barNewLineExtend/main.go
deleted file mode 100644
index 08a6515..0000000
--- a/examples/barNewLineExtend/main.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package main
-
-import (
- "fmt"
- "io"
- "math/rand"
- "sync"
- "time"
-
- "github.com/vbauerster/mpb"
- "github.com/vbauerster/mpb/decor"
-)
-
-func init() {
- rand.Seed(time.Now().UnixNano())
-}
-
-func main() {
- var wg sync.WaitGroup
- p := mpb.New(mpb.WithWaitGroup(&wg))
- total, numBars := 100, 3
- wg.Add(numBars)
-
- for i := 0; i < numBars; i++ {
- name := fmt.Sprintf("Bar#%d:", i)
- efn := func(w io.Writer, s *decor.Statistics) {
- if s.Completed {
- fmt.Fprintf(w, "Bar id: %d has been completed\n", s.ID)
- }
- }
- bar := p.AddBar(int64(total), mpb.BarNewLineExtend(efn),
- mpb.PrependDecorators(
- // simple name decorator
- decor.Name(name),
- // decor.DSyncWidth bit enables column width synchronization
- decor.Percentage(decor.WCSyncSpace),
- ),
- mpb.AppendDecorators(
- // replace ETA decorator with "done" message, OnComplete event
- decor.OnComplete(
- // ETA decorator with ewma age of 60
- decor.EwmaETA(decor.ET_STYLE_GO, 60), "done",
- ),
- ),
- )
- // simulating some work
- go func() {
- defer wg.Done()
- max := 100 * time.Millisecond
- for i := 0; i < total; i++ {
- start := time.Now()
- time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
- // ewma based decorators require work duration measurement
- bar.IncrBy(1, time.Since(start))
- }
- }()
- }
- // wait for all bars to complete and flush
- p.Wait()
-}
diff --git a/examples/cancel/main.go b/examples/cancel/main.go
deleted file mode 100644
index 9da8ed3..0000000
--- a/examples/cancel/main.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package main
-
-import (
- "context"
- "fmt"
- "math/rand"
- "sync"
- "time"
-
- "github.com/vbauerster/mpb"
- "github.com/vbauerster/mpb/decor"
-)
-
-func init() {
- rand.Seed(time.Now().UnixNano())
-}
-
-func main() {
- ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
- defer cancel()
-
- var wg sync.WaitGroup
- p := mpb.New(
- mpb.WithWaitGroup(&wg),
- mpb.WithContext(ctx),
- )
- total := 300
- numBars := 3
- wg.Add(numBars)
-
- for i := 0; i < numBars; i++ {
- name := fmt.Sprintf("Bar#%d:", i)
- bar := p.AddBar(int64(total),
- mpb.PrependDecorators(
- decor.Name(name),
- decor.EwmaETA(decor.ET_STYLE_GO, 60, decor.WCSyncSpace),
- ),
- mpb.AppendDecorators(
- decor.Percentage(decor.WC{W: 5}),
- ),
- )
-
- go func() {
- defer wg.Done()
- max := 100 * time.Millisecond
- for !bar.Completed() {
- start := time.Now()
- time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
- // ewma based decorators require work duration measurement
- bar.IncrBy(1, time.Since(start))
- }
- }()
- }
-
- p.Wait()
-}
diff --git a/examples/complex/main.go b/examples/complex/main.go
deleted file mode 100644
index c610e10..0000000
--- a/examples/complex/main.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package main
-
-import (
- "fmt"
- "math/rand"
- "sync"
- "time"
-
- "github.com/vbauerster/mpb"
- "github.com/vbauerster/mpb/decor"
-)
-
-func init() {
- rand.Seed(time.Now().UnixNano())
-}
-
-func main() {
- doneWg := new(sync.WaitGroup)
- p := mpb.New(mpb.WithWidth(64), mpb.WithWaitGroup(doneWg))
- numBars := 4
-
- var bars []*mpb.Bar
- var downloadWgg []*sync.WaitGroup
- for i := 0; i < numBars; i++ {
- wg := new(sync.WaitGroup)
- wg.Add(1)
- downloadWgg = append(downloadWgg, wg)
- task := fmt.Sprintf("Task#%02d:", i)
- job := "downloading"
- b := p.AddBar(rand.Int63n(201)+100,
- mpb.BarRemoveOnComplete(),
- mpb.PrependDecorators(
- decor.Name(task, decor.WC{W: len(task) + 1, C: decor.DidentRight}),
- decor.Name(job, decor.WCSyncSpaceR),
- decor.CountersNoUnit("%d / %d", decor.WCSyncWidth),
- ),
- mpb.AppendDecorators(decor.Percentage(decor.WC{W: 5})),
- )
- go newTask(wg, b, i+1)
- bars = append(bars, b)
- }
-
- for i := 0; i < numBars; i++ {
- doneWg.Add(1)
- i := i
- go func() {
- task := fmt.Sprintf("Task#%02d:", i)
- job := "installing"
- // preparing delayed bars
- b := p.AddBar(rand.Int63n(101)+100,
- mpb.BarReplaceOnComplete(bars[i]),
- mpb.BarClearOnComplete(),
- mpb.PrependDecorators(
- decor.Name(task, decor.WC{W: len(task) + 1, C: decor.DidentRight}),
- decor.OnComplete(decor.Name(job, decor.WCSyncSpaceR), "done!"),
- decor.OnComplete(decor.EwmaETA(decor.ET_STYLE_MMSS, 60, decor.WCSyncWidth), "")),
- mpb.AppendDecorators(
- decor.OnComplete(decor.Percentage(decor.WC{W: 5}), ""),
- ),
- )
- // waiting for download to complete, before starting install job
- downloadWgg[i].Wait()
- go newTask(doneWg, b, numBars-i)
- }()
- }
-
- p.Wait()
-}
-
-func newTask(wg *sync.WaitGroup, b *mpb.Bar, incrBy int) {
- defer wg.Done()
- max := 100 * time.Millisecond
- for !b.Completed() {
- start := time.Now()
- time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
- // ewma based decorators require work duration measurement
- b.IncrBy(incrBy, time.Since(start))
- }
-}
diff --git a/examples/differentWidth/main.go b/examples/differentWidth/main.go
deleted file mode 100644
index c327b34..0000000
--- a/examples/differentWidth/main.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package main
-
-import (
- "fmt"
- "math/rand"
- "sync"
- "time"
-
- "github.com/vbauerster/mpb"
- "github.com/vbauerster/mpb/decor"
-)
-
-func init() {
- rand.Seed(time.Now().UnixNano())
-}
-
-func main() {
- var wg sync.WaitGroup
- p := mpb.New(
- mpb.WithWaitGroup(&wg),
- // container's width.
- mpb.WithWidth(60),
- )
- total, numBars := 100, 3
- wg.Add(numBars)
-
- for i := 0; i < numBars; i++ {
- name := fmt.Sprintf("Bar#%d:", i)
- bar := p.AddBar(int64(total),
- // set BarWidth 40 for bar 1 and 2
- mpb.OptionOnCondition(mpb.BarWidth(40), func() bool { return i > 0 }),
- mpb.PrependDecorators(
- // simple name decorator
- decor.Name(name),
- // decor.DSyncWidth bit enables column width synchronization
- decor.Percentage(decor.WCSyncSpace),
- ),
- mpb.AppendDecorators(
- // replace ETA decorator with "done" message, OnComplete event
- decor.OnComplete(
- // ETA decorator with ewma age of 60
- decor.EwmaETA(decor.ET_STYLE_GO, 60), "done",
- ),
- ),
- )
- // simulating some work
- go func() {
- defer wg.Done()
- max := 100 * time.Millisecond
- for i := 0; i < total; i++ {
- start := time.Now()
- time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
- // ewma based decorators require work duration measurement
- bar.IncrBy(1, time.Since(start))
- }
- }()
- }
- // wait for all bars to complete and flush
- p.Wait()
-}
diff --git a/examples/dynTotal/main.go b/examples/dynTotal/main.go
deleted file mode 100644
index 18313c9..0000000
--- a/examples/dynTotal/main.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package main
-
-import (
- "io"
- "math/rand"
- "time"
-
- "github.com/vbauerster/mpb"
- "github.com/vbauerster/mpb/decor"
-)
-
-func init() {
- rand.Seed(time.Now().UnixNano())
-}
-
-func main() {
- p := mpb.New(mpb.WithWidth(64))
-
- var total int64
- bar := p.AddBar(total,
- mpb.PrependDecorators(decor.Counters(decor.UnitKiB, "% .1f / % .1f")),
- mpb.AppendDecorators(decor.Percentage()),
- )
-
- maxSleep := 100 * time.Millisecond
- read := makeStream(200)
- for {
- n, err := read()
- total += int64(n)
- time.Sleep(time.Duration(rand.Intn(10)+1) * maxSleep / 10)
- bar.IncrBy(n)
- if err == io.EOF {
- // total is known, final=true
- bar.SetTotal(total, true)
- break
- }
- // total is unknown, final=false
- bar.SetTotal(total+2048, false)
- }
-
- p.Wait()
-}
-
-func makeStream(limit int) func() (int, error) {
- return func() (int, error) {
- if limit <= 0 {
- return 0, io.EOF
- }
- limit--
- return rand.Intn(1024) + 1, nil
- }
-}
diff --git a/examples/gifs/godEMrCZmJkHYH1X9dN4Nm0U7.svg b/examples/gifs/godEMrCZmJkHYH1X9dN4Nm0U7.svg
deleted file mode 100644
index f794408..0000000
--- a/examples/gifs/godEMrCZmJkHYH1X9dN4Nm0U7.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/examples/gifs/hIpTa3A5rQz65ssiVuRJu87X6.svg b/examples/gifs/hIpTa3A5rQz65ssiVuRJu87X6.svg
deleted file mode 100644
index 163921c..0000000
--- a/examples/gifs/hIpTa3A5rQz65ssiVuRJu87X6.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/examples/gifs/wHzf1M7sd7B3zVa2scBMnjqRf.svg b/examples/gifs/wHzf1M7sd7B3zVa2scBMnjqRf.svg
deleted file mode 100644
index 9e3b871..0000000
--- a/examples/gifs/wHzf1M7sd7B3zVa2scBMnjqRf.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/examples/io/multiple/main.go b/examples/io/multiple/main.go
deleted file mode 100644
index 8a02e16..0000000
--- a/examples/io/multiple/main.go
+++ /dev/null
@@ -1,83 +0,0 @@
-package main
-
-import (
- "fmt"
- "io"
- "log"
- "net/http"
- "os"
- "path/filepath"
- "sync"
-
- "github.com/vbauerster/mpb"
- "github.com/vbauerster/mpb/decor"
-)
-
-func main() {
- log.SetOutput(os.Stderr)
-
- url1 := "https://homebrew.bintray.com/bottles/youtube-dl-2016.12.12.sierra.bottle.tar.gz"
- url2 := "https://homebrew.bintray.com/bottles/libtiff-4.0.7.sierra.bottle.tar.gz"
-
- var wg sync.WaitGroup
- p := mpb.New(mpb.WithWidth(64), mpb.WithWaitGroup(&wg))
-
- for i, url := range [...]string{url1, url2} {
- wg.Add(1)
- name := fmt.Sprintf("url%d:", i+1)
- go download(&wg, p, name, url, i)
- }
-
- p.Wait()
-}
-
-func download(wg *sync.WaitGroup, p *mpb.Progress, name, url string, n int) {
- defer wg.Done()
- resp, err := http.Get(url)
- if err != nil {
- log.Printf("%s: %v", name, err)
- return
- }
- defer resp.Body.Close()
-
- if resp.StatusCode != http.StatusOK {
- err = fmt.Errorf("non-200 status: %s", resp.Status)
- log.Printf("%s: %v", name, err)
- return
- }
-
- size := resp.ContentLength
-
- // create dest
- destName := filepath.Base(url)
- dest, err := os.Create(destName)
- if err != nil {
- err = fmt.Errorf("Can't create %s: %v", destName, err)
- log.Printf("%s: %v", name, err)
- return
- }
-
- // create bar with appropriate decorators
- bar := p.AddBar(size, mpb.BarPriority(n),
- mpb.PrependDecorators(
- decor.Name(name, decor.WC{W: len(name) + 1, C: decor.DidentRight}),
- decor.CountersKibiByte("%6.1f / %6.1f", decor.WCSyncWidth),
- ),
- mpb.AppendDecorators(
- decor.EwmaETA(decor.ET_STYLE_HHMMSS, 1024*4, decor.WCSyncWidth),
- decor.AverageSpeed(decor.UnitKiB, "% .2f"),
- ),
- )
-
- // create proxy reader
- reader := bar.ProxyReader(resp.Body)
- // and copy from reader
- _, err = io.Copy(dest, reader)
-
- if e := dest.Close(); err == nil {
- err = e
- }
- if err != nil {
- log.Printf("%s: %v", name, err)
- }
-}
diff --git a/examples/io/single/main.go b/examples/io/single/main.go
deleted file mode 100644
index 09d6c11..0000000
--- a/examples/io/single/main.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package main
-
-import (
- "fmt"
- "io"
- "net/http"
- "os"
- "path/filepath"
- "time"
-
- "github.com/vbauerster/mpb"
- "github.com/vbauerster/mpb/decor"
-)
-
-func main() {
- url := "https://github.com/onivim/oni/releases/download/v0.3.4/Oni-0.3.4-amd64-linux.deb"
-
- resp, err := http.Get(url)
- if err != nil {
- panic(err)
- }
- defer resp.Body.Close()
-
- if resp.StatusCode != http.StatusOK {
- fmt.Printf("Server return non-200 status: %s\n", resp.Status)
- return
- }
-
- size := resp.ContentLength
-
- // create dest
- destName := filepath.Base(url)
- dest, err := os.Create(destName)
- if err != nil {
- fmt.Printf("Can't create %s: %v\n", destName, err)
- return
- }
- defer dest.Close()
-
- p := mpb.New(
- mpb.WithWidth(60),
- mpb.WithRefreshRate(180*time.Millisecond),
- )
-
- bar := p.AddBar(size, mpb.BarStyle("[=>-|"),
- mpb.PrependDecorators(
- decor.CountersKibiByte("% 6.1f / % 6.1f"),
- ),
- mpb.AppendDecorators(
- decor.EwmaETA(decor.ET_STYLE_MMSS, float64(size)/2048),
- decor.Name(" ] "),
- decor.AverageSpeed(decor.UnitKiB, "% .2f"),
- ),
- )
-
- // create proxy reader
- reader := bar.ProxyReader(resp.Body)
-
- // and copy from reader, ignoring errors
- io.Copy(dest, reader)
-
- p.Wait()
-}
diff --git a/examples/panic/main.go b/examples/panic/main.go
deleted file mode 100644
index b951fe6..0000000
--- a/examples/panic/main.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package main
-
-import (
- "fmt"
- "os"
- "sync"
- "time"
-
- "github.com/vbauerster/mpb"
- "github.com/vbauerster/mpb/decor"
-)
-
-func main() {
- var wg sync.WaitGroup
- p := mpb.New(mpb.WithWaitGroup(&wg), mpb.WithDebugOutput(os.Stderr))
-
- wantPanic := "Some really long panic panic panic panic panic panic panic, really it is very long"
- numBars := 3
- wg.Add(numBars)
-
- for i := 0; i < numBars; i++ {
- name := fmt.Sprintf("b#%02d:", i)
- bar := p.AddBar(100, mpb.BarID(i), mpb.PrependDecorators(panicDecorator(name, wantPanic)))
-
- go func() {
- defer wg.Done()
- for i := 0; i < 100; i++ {
- time.Sleep(50 * time.Millisecond)
- bar.Increment()
- }
- }()
- }
-
- p.Wait()
-}
-
-func panicDecorator(name, panicMsg string) decor.Decorator {
- d := &decorator{
- msg: name,
- panicMsg: panicMsg,
- }
- d.Init()
- return d
-}
-
-type decorator struct {
- decor.WC
- msg string
- panicMsg string
-}
-
-func (d *decorator) Decor(st *decor.Statistics) string {
- if st.ID == 1 && st.Current >= 42 {
- panic(d.panicMsg)
- }
- return d.FormatMsg(d.msg)
-}
diff --git a/examples/remove/main.go b/examples/remove/main.go
deleted file mode 100644
index 308978f..0000000
--- a/examples/remove/main.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package main
-
-import (
- "fmt"
- "math/rand"
- "sync"
- "time"
-
- "github.com/vbauerster/mpb"
- "github.com/vbauerster/mpb/decor"
-)
-
-func init() {
- rand.Seed(time.Now().UnixNano())
-}
-
-func main() {
- var wg sync.WaitGroup
- p := mpb.New(mpb.WithWaitGroup(&wg))
- total := 100
- numBars := 3
- wg.Add(numBars)
-
- for i := 0; i < numBars; i++ {
- name := fmt.Sprintf("Bar#%d:", i)
- b := p.AddBar(int64(total), mpb.BarID(i),
- mpb.OptionOnCondition(mpb.BarRemoveOnComplete(), func() bool { return i == 0 }),
- mpb.PrependDecorators(
- decor.Name(name),
- decor.EwmaETA(decor.ET_STYLE_GO, 60, decor.WCSyncSpace),
- ),
- mpb.AppendDecorators(decor.Percentage()),
- )
- go func() {
- defer wg.Done()
- max := 100 * time.Millisecond
- for i := 0; i < total; i++ {
- start := time.Now()
- if b.ID() == 2 && i == 42 {
- p.Abort(b, true)
- return
- }
- time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
- // ewma based decorators require work duration measurement
- b.IncrBy(1, time.Since(start))
- }
- }()
- }
-
- p.Wait()
-}
diff --git a/examples/simple/main.go b/examples/simple/main.go
deleted file mode 100644
index afc2050..0000000
--- a/examples/simple/main.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package main
-
-import (
- "fmt"
- "math/rand"
- "sync"
- "time"
-
- "github.com/vbauerster/mpb"
- "github.com/vbauerster/mpb/decor"
-)
-
-func init() {
- rand.Seed(time.Now().UnixNano())
-}
-
-func main() {
- var wg sync.WaitGroup
- p := mpb.New(mpb.WithWaitGroup(&wg))
- total, numBars := 100, 3
- wg.Add(numBars)
-
- for i := 0; i < numBars; i++ {
- name := fmt.Sprintf("Bar#%d:", i)
- bar := p.AddBar(int64(total),
- mpb.PrependDecorators(
- // simple name decorator
- decor.Name(name),
- // decor.DSyncWidth bit enables column width synchronization
- decor.Percentage(decor.WCSyncSpace),
- ),
- mpb.AppendDecorators(
- // replace ETA decorator with "done" message, OnComplete event
- decor.OnComplete(
- // ETA decorator with ewma age of 60
- decor.EwmaETA(decor.ET_STYLE_GO, 60), "done",
- ),
- ),
- )
- // simulating some work
- go func() {
- defer wg.Done()
- max := 100 * time.Millisecond
- for i := 0; i < total; i++ {
- start := time.Now()
- time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
- // ewma based decorators require work duration measurement
- bar.IncrBy(1, time.Since(start))
- }
- }()
- }
- // wait for all bars to complete and flush
- p.Wait()
-}
diff --git a/examples/singleBar/main.go b/examples/singleBar/main.go
deleted file mode 100644
index c712afb..0000000
--- a/examples/singleBar/main.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package main
-
-import (
- "math/rand"
- "time"
-
- "github.com/vbauerster/mpb"
- "github.com/vbauerster/mpb/decor"
-)
-
-func main() {
- p := mpb.New(
- // override default (80) width
- mpb.WithWidth(64),
- // override default 120ms refresh rate
- mpb.WithRefreshRate(180*time.Millisecond),
- )
-
- total := 100
- name := "Single Bar:"
- // adding a single bar
- bar := p.AddBar(int64(total),
- // override default "[=>-]" style
- mpb.BarStyle("╢▌▌░╟"),
- mpb.PrependDecorators(
- // display our name with one space on the right
- decor.Name(name, decor.WC{W: len(name) + 1, C: decor.DidentRight}),
- // replace ETA decorator with "done" message, OnComplete event
- decor.OnComplete(
- // ETA decorator with ewma age of 60, and width reservation of 4
- decor.EwmaETA(decor.ET_STYLE_GO, 60, decor.WC{W: 4}), "done",
- ),
- ),
- mpb.AppendDecorators(decor.Percentage()),
- )
- // simulating some work
- max := 100 * time.Millisecond
- for i := 0; i < total; i++ {
- start := time.Now()
- time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
- // ewma based decorators require work duration measurement
- bar.IncrBy(1, time.Since(start))
- }
- // wait for our bar to complete and flush
- p.Wait()
-}
diff --git a/examples/sort/main.go b/examples/sort/main.go
deleted file mode 100644
index 3dd979c..0000000
--- a/examples/sort/main.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package main
-
-import (
- "fmt"
- "math/rand"
- "sync"
- "time"
-
- "github.com/vbauerster/mpb"
- "github.com/vbauerster/mpb/decor"
-)
-
-func init() {
- rand.Seed(time.Now().UnixNano())
-}
-
-func main() {
- var wg sync.WaitGroup
- p := mpb.New(mpb.WithWaitGroup(&wg))
- total := 100
- numBars := 3
- wg.Add(numBars)
-
- for i := 0; i < numBars; i++ {
- var name string
- if i != 1 {
- name = fmt.Sprintf("Bar#%d:", i)
- }
- b := p.AddBar(int64(total),
- mpb.PrependDecorators(
- decor.Name(name, decor.WCSyncWidth),
- decor.CountersNoUnit("%d / %d", decor.WCSyncSpace),
- ),
- mpb.AppendDecorators(
- decor.EwmaETA(decor.ET_STYLE_GO, 60, decor.WC{W: 3}),
- ),
- )
- go func() {
- defer wg.Done()
- max := 100 * time.Millisecond
- for i := 0; i < total; i++ {
- start := time.Now()
- time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
- if i&1 == 1 {
- priority := total - int(b.Current())
- p.UpdateBarPriority(b, priority)
- }
- // ewma based decorators require work duration measurement
- b.IncrBy(1, time.Since(start))
- }
- }()
- }
-
- p.Wait()
-}
diff --git a/examples/spinner/main.go b/examples/spinner/main.go
deleted file mode 100644
index 1f81897..0000000
--- a/examples/spinner/main.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package main
-
-import (
- "fmt"
- "math/rand"
- "sync"
- "time"
-
- "github.com/vbauerster/mpb"
- "github.com/vbauerster/mpb/decor"
-)
-
-func init() {
- rand.Seed(time.Now().UnixNano())
-}
-
-func main() {
- var wg sync.WaitGroup
- p := mpb.New(
- mpb.WithWaitGroup(&wg),
- mpb.WithWidth(13),
- )
- total, numBars := 101, 3
- wg.Add(numBars)
-
- for i := 0; i < numBars; i++ {
- name := fmt.Sprintf("Bar#%d:", i)
- var bar *mpb.Bar
- if i == 0 {
- bar = p.AddBar(int64(total),
- // override default "[=>-]" style
- mpb.BarStyle("╢▌▌░╟"),
- mpb.PrependDecorators(
- // simple name decorator
- decor.Name(name),
- ),
- mpb.AppendDecorators(
- // replace ETA decorator with "done" message, OnComplete event
- decor.OnComplete(
- // ETA decorator with ewma age of 60
- decor.EwmaETA(decor.ET_STYLE_GO, 60), "done",
- ),
- ),
- )
- } else {
- bar = p.AddSpinner(int64(total), mpb.SpinnerOnMiddle,
- // override default {"⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"} style
- mpb.SpinnerStyle([]string{"∙∙∙", "●∙∙", "∙●∙", "∙∙●", "∙∙∙"}),
- mpb.PrependDecorators(
- // simple name decorator
- decor.Name(name),
- ),
- mpb.AppendDecorators(
- // replace ETA decorator with "done" message, OnComplete event
- decor.OnComplete(
- // ETA decorator with ewma age of 60
- decor.EwmaETA(decor.ET_STYLE_GO, 60), "done",
- ),
- ),
- )
- }
-
- // simulating some work
- go func() {
- defer wg.Done()
- max := 100 * time.Millisecond
- for i := 0; i < total; i++ {
- start := time.Now()
- time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
- // ewma based decorators require work duration measurement
- bar.IncrBy(1, time.Since(start))
- }
- }()
- }
- // wait for all bars to complete and flush
- p.Wait()
-}
diff --git a/examples/stress/main.go b/examples/stress/main.go
deleted file mode 100644
index 09d4e55..0000000
--- a/examples/stress/main.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package main
-
-import (
- "fmt"
- "math/rand"
- "sync"
- "time"
-
- "github.com/vbauerster/mpb"
- "github.com/vbauerster/mpb/decor"
-)
-
-const (
- totalBars = 32
-)
-
-func init() {
- rand.Seed(time.Now().UnixNano())
-}
-
-func main() {
- var wg sync.WaitGroup
- p := mpb.New(
- mpb.WithWaitGroup(&wg),
- mpb.WithRefreshRate(50*time.Millisecond),
- )
- wg.Add(totalBars)
-
- for i := 0; i < totalBars; i++ {
- name := fmt.Sprintf("Bar#%02d: ", i)
- total := rand.Intn(320) + 10
- bar := p.AddBar(int64(total),
- mpb.PrependDecorators(
- decor.Name(name),
- decor.EwmaETA(decor.ET_STYLE_GO, 60, decor.WCSyncSpace),
- ),
- mpb.AppendDecorators(
- decor.Percentage(decor.WC{W: 5}),
- ),
- )
-
- go func() {
- defer wg.Done()
- max := 100 * time.Millisecond
- for !bar.Completed() {
- start := time.Now()
- time.Sleep(time.Duration(rand.Intn(10)+1) * max / 10)
- // ewma based decorators require work duration measurement
- bar.IncrBy(1, time.Since(start))
- }
- }()
- }
-
- p.Wait()
-}
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..fe1c850
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,9 @@
+module github.com/vbauerster/mpb/v4
+
+require (
+ github.com/VividCortex/ewma v1.1.1
+ github.com/mattn/go-isatty v0.0.4
+ github.com/vbauerster/mpb v3.3.4+incompatible
+ golang.org/x/crypto v0.0.0-20190129170551-bf88e3f4ba72
+ golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc // indirect
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..b975fcb
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,10 @@
+github.com/VividCortex/ewma v1.1.1 h1:MnEK4VOv6n0RSY4vtRe3h11qjxL3+t0B8yOL8iMXdcM=
+github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=
+github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
+github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/vbauerster/mpb v3.3.4+incompatible h1:DDIhnwmgTQIDZo+SWlEr5d6mJBxkOLBwCXPzunhEfJ4=
+github.com/vbauerster/mpb v3.3.4+incompatible/go.mod h1:zAHG26FUhVKETRu+MWqYXcI70POlC6N8up9p1dID7SU=
+golang.org/x/crypto v0.0.0-20190129170551-bf88e3f4ba72 h1:hOSpsWG5LMauyHIJqtLUU+44acN/ft/9cpzc1ynVDyg=
+golang.org/x/crypto v0.0.0-20190129170551-bf88e3f4ba72/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc h1:WiYx1rIFmx8c0mXAFtv5D/mHyKe1+jmuP7PViuwqwuQ=
+golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
diff --git a/go.test.sh b/go.test.sh
deleted file mode 100755
index 34dbbfb..0000000
--- a/go.test.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-echo "" > coverage.txt
-
-for d in $(go list ./... | grep -v vendor); do
- go test -race -coverprofile=profile.out -covermode=atomic $d
- if [ -f profile.out ]; then
- cat profile.out >> coverage.txt
- rm profile.out
- fi
-done