Merge pull request #1737 from estesp/progress-line-fixup

Handle progress line length properly for formatting

progress/writer.go

@@ -4,11 +4,16 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"regexp"
 	"strings"
 
 	"github.com/containerd/console"
 )
 
+var (
+	regexCleanLine = regexp.MustCompile("\x1b\\[[0-9]+m[\x1b]?")
+)
+
 // Writer buffers writes until flush, at which time the last screen is cleared
 // and the current buffer contents are written. This is useful for
 // implementing progress displays, such as those implemented in docker and
@@ -48,7 +53,7 @@ func (w *Writer) Flush() error {
 	strlines := strings.Split(w.buf.String(), "\n")
 	w.lines = -1
 	for _, line := range strlines {
-		w.lines += len(line)/int(ws.Width) + 1
+		w.lines += (len(stripLine(line))-1)/int(ws.Width) + 1
 	}
 
 	if _, err := w.w.Write(w.buf.Bytes()); err != nil {
@@ -71,3 +76,7 @@ func (w *Writer) clear() error {
 
 	return nil
 }
+
+func stripLine(line string) string {
+	return string(regexCleanLine.ReplaceAll([]byte(line), []byte{}))
+}