Commit bbce49c0bdeead87947d7f96256b736fec43db07 - golang-github-vbauerster-mpb

expose Filler interface Vladimir Bauer 7 years ago

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

+11

-3

bar.go less more

31	31	shutdown chan struct{}
32	32	}
33	33
34		type filler interface {
	34	type Filler interface {
35	35	fill(w io.Writer, width int, s *decor.Statistics)
36	36	}
37	37
38	38	type (
39	39	bState struct {
40		filler filler
	40	filler Filler
41	41	id int
42	42	width int
43	43	alignment int

74	74	}
75	75	)
76	76
77		func newBar(wg sync.WaitGroup, id, width int, total int64, cancel <-chan struct{}, options ...BarOption) Bar {
	77	func newBar(
	78	wg *sync.WaitGroup,
	79	filler Filler,
	80	id, width int,
	81	total int64,
	82	cancel <-chan struct{},
	83	options ...BarOption,
	84	) *Bar {
78	85	if total <= 0 {
79	86	total = time.Now().Unix()
80	87	}
81	88
82	89	s := &bState{
	90	filler: filler,
83	91	id: id,
84	92	priority: id,
85	93	width: width,

+13

-25

progress.go less more

80	80
81	81	// AddBar creates a new progress bar and adds to the container.
82	82	func (p Progress) AddBar(total int64, options ...BarOption) Bar {
83		// make sure filler is initialized first
84		args := []BarOption{
85		func(s *bState) {
86		s.filler = &barFiller{
87		format: defaultBarStyle,
88		}
89		},
90		}
91		args = append(args, options...)
92		return p.add(total, args...)
	83	filler := &barFiller{
	84	format: defaultBarStyle,
	85	}
	86	return p.Add(total, filler, options...)
93	87	}
94	88
95	89	// AddSpinner creates a new spinner bar and adds to the container.
96	90	func (p Progress) AddSpinner(total int64, alignment SpinnerAlignment, options ...BarOption) Bar {
97		// make sure filler is initialized first
98		args := []BarOption{
99		func(s *bState) {
100		s.filler = &spinnerFiller{
101		frames: defaultSpinnerStyle,
102		alignment: alignment,
103		}
104		},
105		}
106		args = append(args, options...)
107		return p.add(total, args...)
108		}
109
110		func (p Progress) add(total int64, options ...BarOption) Bar {
	91	filler := &spinnerFiller{
	92	frames: defaultSpinnerStyle,
	93	alignment: alignment,
	94	}
	95	return p.Add(total, filler, options...)
	96	}
	97
	98	func (p Progress) Add(total int64, filler Filler, options ...BarOption) Bar {
111	99	p.wg.Add(1)
112	100	result := make(chan *Bar)
113	101	select {
114	102	case p.operateState <- func(s *pState) {
115		b := newBar(p.wg, s.idCounter, s.width, total, s.cancel, options...)
	103	b := newBar(p.wg, filler, s.idCounter, s.width, total, s.cancel, options...)
116	104	if b.runningBar != nil {
117	105	s.waitBars[b.runningBar] = b
118	106	} else {