@@ -21,22 +21,19 @@ limitations under the License.
2121package util
2222
2323import (
24- "fmt"
2524 "io"
2625 "path/filepath"
2726 "sync"
2827
29- "github.com/cheggaaa/pb"
30- "github.com/golang/glog"
28+ "github.com/cheggaaa/pb/v3"
3129 "github.com/hashicorp/go-getter"
3230)
3331
3432var defaultProgressBar getter.ProgressTracker = & progressBar {}
3533
3634type progressBar struct {
37- lock sync.Mutex
38- pool * pb.Pool
39- pbs int
35+ lock sync.Mutex
36+ progress * pb.ProgressBar
4037}
4138
4239// TrackProgress instantiates a new progress bar that will
@@ -45,38 +42,24 @@ type progressBar struct {
4542func (cpb * progressBar ) TrackProgress (src string , currentSize , totalSize int64 , stream io.ReadCloser ) io.ReadCloser {
4643 cpb .lock .Lock ()
4744 defer cpb .lock .Unlock ()
48-
49- if cpb .pool == nil {
50- cpb .pool = pb .NewPool ()
51- if err := cpb .pool .Start (); err != nil {
52- glog .Errorf ("pool start: %v" , err )
53- }
45+ if cpb .progress == nil {
46+ cpb .progress = pb .New64 (totalSize )
5447 }
48+ p := pb .Full .Start64 (totalSize )
49+ p .Set ("prefix" , filepath .Base (src + ": " ))
50+ p .SetCurrent (currentSize )
51+ p .Set (pb .Bytes , true )
5552
56- p := pb .New64 (totalSize )
57- p .Set64 (currentSize )
58- p .SetUnits (pb .U_BYTES )
59- p .Prefix (fmt .Sprintf (" %s:" , filepath .Base (src )))
6053 // Just a hair less than 80 (standard terminal width) for aesthetics & pasting into docs
61- p .SetWidth (78 )
62- cpb .pool .Add (p )
63- reader := p .NewProxyReader (stream )
54+ p .SetWidth (79 )
55+ barReader := p .NewProxyReader (stream )
6456
65- cpb .pbs ++
6657 return & readCloser {
67- Reader : reader ,
58+ Reader : barReader ,
6859 close : func () error {
6960 cpb .lock .Lock ()
7061 defer cpb .lock .Unlock ()
71-
7262 p .Finish ()
73- cpb .pbs --
74- if cpb .pbs <= 0 {
75- if err := cpb .pool .Stop (); err != nil {
76- glog .Errorf ("pool stop: %v" , err )
77- }
78- cpb .pool = nil
79- }
8063 return nil
8164 },
8265 }
0 commit comments