Commit e5ca79928b7b9a64239a3272cd8eb38c71a76cf0 - golang-github-vbauerster-mpb

refactor newProxyReader Make it bar's method. Vladimir Bauer 4 years ago

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

-1

bar.go less more

105	105	if r == nil {
106	106	panic("expected non nil io.Reader")
107	107	}
108		return newProxyReader(r, b)
	108	return b.newProxyReader(r)
109	109	}
110	110
111	111	// ID returs id of the bar.

-5

proxyreader.go less more

63	63	return n, err
64	64	}
65	65
66		func newProxyReader(r io.Reader, bar *Bar) io.ReadCloser {
	66	func (bar *Bar) newProxyReader(r io.Reader) io.ReadCloser {
67	67	rc := toReadCloser(r)
68		rc = &proxyReader{rc, bar}
69
70		if wt, isWriterTo := r.(io.WriterTo); bar.hasEwmaDecorators {
71		rc = &ewmaProxyReader{rc, bar}
	68	wt, isWriterTo := r.(io.WriterTo)
	69	if bar.hasEwmaDecorators {
72	70	if isWriterTo {
73	71	rc = &ewmaProxyWriterTo{rc, wt, bar}
	72	} else {
	73	rc = &ewmaProxyReader{rc, bar}
74	74	}
75	75	} else if isWriterTo {
76	76	rc = &proxyWriterTo{rc, wt, bar}
	77	} else {
	78	rc = &proxyReader{rc, bar}
77	79	}
78	80	return rc
79	81	}