split in 3 files

utils/progressreader.go

@@ -0,0 +1,55 @@
+package utils
+
+import (
+	"io"
+)
+
+// Reader with progress bar
+type progressReader struct {
+	reader   io.ReadCloser // Stream to read from
+	output   io.Writer     // Where to send progress bar to
+	progress JSONProgress
+	//	readTotal    int    // Expected stream length (bytes)
+	//	readProgress int    // How much has been read so far (bytes)
+	lastUpdate int // How many bytes read at least update
+	ID         string
+	action     string
+	//	template   string // Template to print. Default "%v/%v (%v)"
+	sf      *StreamFormatter
+	newLine bool
+}
+
+func (r *progressReader) Read(p []byte) (n int, err error) {
+	read, err := io.ReadCloser(r.reader).Read(p)
+	r.progress.Current += read
+	updateEvery := 1024 * 512 //512kB
+	if r.progress.Total > 0 {
+		// Update progress for every 1% read if 1% < 512kB
+		if increment := int(0.01 * float64(r.progress.Total)); increment < updateEvery {
+			updateEvery = increment
+		}
+	}
+	if r.progress.Current-r.lastUpdate > updateEvery || err != nil {
+		r.output.Write(r.sf.FormatProgress(r.ID, r.action, &r.progress))
+		r.lastUpdate = r.progress.Current
+	}
+	// Send newline when complete
+	if r.newLine && err != nil {
+		r.output.Write(r.sf.FormatStatus("", ""))
+	}
+	return read, err
+}
+func (r *progressReader) Close() error {
+	return io.ReadCloser(r.reader).Close()
+}
+func ProgressReader(r io.ReadCloser, size int, output io.Writer, sf *StreamFormatter, newline bool, ID, action string) *progressReader {
+	return &progressReader{
+		reader:   r,
+		output:   NewWriteFlusher(output),
+		ID:       ID,
+		action:   action,
+		progress: JSONProgress{Total: size},
+		sf:       sf,
+		newLine:  newline,
+	}
+}