Commit edadc6586bc771ae3788228be570fc03767bb84a - golang-github-vbauerster-mpb

refactor: sort example Vladimir Bauer 9 years ago

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

-2

decorators.go less more

59	59	return b
60	60	}
61	61
62		func (b Bar) PrependCounters(unit Units, minWidth int, conf byte) Bar {
	62	func (b Bar) PrependCounters(pairFormat string, unit Units, minWidth int, conf byte) Bar {
63	63	format := "%%"
64	64	if (conf & DidentRight) != 0 {
65	65	format += "-"

68	68	b.PrependFunc(func(s *Statistics, myWidth chan<- int, maxWidth <-chan int) string {
69	69	current := Format(s.Current).To(unit)
70	70	total := Format(s.Total).To(unit)
71		str := fmt.Sprintf("%s / %s", current, total)
	71	str := fmt.Sprintf(pairFormat, current, total)
72	72	if (conf & DwidthSync) != 0 {
73	73	myWidth <- utf8.RuneCountInString(str)
74	74	max := <-maxWidth

+10

-14

example/sort/main.go less more

45	45	var wg sync.WaitGroup
46	46	p := mpb.New(nil).SetWidth(60).BeforeRenderFunc(sortByProgressFunc())
47	47
48		name1 := "Bar#1: "
	48	name1 := "Bar#1:"
49	49	bar1 := p.AddBar(100).
50		PrependName(name1, len(name1)).PrependFunc(getDecor()).
51		AppendETA(-6)
	50	PrependName(name1, 0, mpb.DwidthSync).
	51	PrependCounters("%3s/%3s", 0, 10, mpb.DwidthSync\|mpb.DextraSpace).
	52	AppendETA(3, 0)
52	53	wg.Add(1)
53	54	go func() {
54	55	defer wg.Done()

61	62	}()
62	63
63	64	bar2 := p.AddBar(60).
64		PrependName("", 0-len(name1)).PrependFunc(getDecor()).
65		AppendETA(-6)
	65	PrependName("", 0, mpb.DwidthSync).
	66	PrependCounters("%3s/%3s", 0, 10, mpb.DwidthSync\|mpb.DextraSpace).
	67	AppendETA(3, 0)
66	68	wg.Add(1)
67	69	go func() {
68	70	defer wg.Done()

75	77	}()
76	78
77	79	bar3 := p.AddBar(80).
78		PrependName("Bar#3: ", 0).PrependFunc(getDecor()).
79		AppendETA(-6)
	80	PrependName("Bar#3:", 0, mpb.DwidthSync).
	81	PrependCounters("%3s/%3s", 0, 10, mpb.DwidthSync\|mpb.DextraSpace).
	82	AppendETA(3, 0)
80	83	wg.Add(1)
81	84	go func() {
82	85	defer wg.Done()

94	97	fmt.Println("stop")
95	98	}
96	99
97		func getDecor() mpb.DecoratorFunc {
98		return func(s *mpb.Statistics, myWidth chan<- int, maxWidth <-chan int) string {
99		str := fmt.Sprintf("%d/%d", s.Current, s.Total)
100		return fmt.Sprintf("%-7s", str)
101		}
102		}
103
104	100	func sleep(blockSize int) {
105	101	time.Sleep(time.Duration(blockSize) * (50time.Millisecond + time.Duration(rand.Intn(5int(time.Millisecond)))))
106	102	}