github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Handle progress line length properly for formatting

Browse Source 
Two issues with a prior PR for handling line-spanning progress bars are
fixed in this PR:
 - corner case where output line len == term width: extra line was being
 added
 - line length calculation was including escape characters causing
 calculations to span lines when output was still only on one line

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
This commit is contained in:
Phil Estes 2017-11-09 15:58:51 -05:00
parent 2b8ed96d2a
commit b1527e0a10
No known key found for this signature in database
GPG Key ID: 0F386284C03A1162
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
progress/writer.go
View File

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