kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #2677 from mrallen1/fix/2627

Browse source 
Check for a terminal before using escapes
This commit is contained in:
Guillaume J. Charmes 2013-11-22 11:30:16 -08:00
commit 6130f2531e
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commands.go
View file

@ -2328,7 +2328,7 @@ func (cli *DockerCli) stream(method, path string, in io.Reader, out io.Writer, h
} }
if matchesContentType(resp.Header.Get("Content-Type"), "application/json") { if matchesContentType(resp.Header.Get("Content-Type"), "application/json") {
return utils.DisplayJSONMessagesStream(resp.Body, out) return utils.DisplayJSONMessagesStream(resp.Body, out, cli.isTerminal)
} }
if _, err := io.Copy(out, resp.Body); err != nil { if _, err := io.Copy(out, resp.Body); err != nil {
return err return err

27
utils/utils.go
View file

@ -779,14 +779,19 @@ func NewHTTPRequestError(msg string, res *http.Response) error {
} }
} }
func (jm *JSONMessage) Display(out io.Writer) error { func (jm *JSONMessage) Display(out io.Writer, isTerminal bool) error {
if jm.Error != nil { if jm.Error != nil {
if jm.Error.Code == 401 { if jm.Error.Code == 401 {
return fmt.Errorf("Authentication is required.") return fmt.Errorf("Authentication is required.")
} }
return jm.Error return jm.Error
} }
fmt.Fprintf(out, "%c[2K\r", 27) endl := ""
if isTerminal {
// <ESC>[2K = erase entire current line
fmt.Fprintf(out, "%c[2K\r", 27)
endl = "\r"
}
if jm.Time != 0 { if jm.Time != 0 {
fmt.Fprintf(out, "[%s] ", time.Unix(jm.Time, 0)) fmt.Fprintf(out, "[%s] ", time.Unix(jm.Time, 0))
} }
@ -797,14 +802,14 @@ func (jm *JSONMessage) Display(out io.Writer) error {
fmt.Fprintf(out, "(from %s) ", jm.From) fmt.Fprintf(out, "(from %s) ", jm.From)
} }
if jm.Progress != "" { if jm.Progress != "" {
fmt.Fprintf(out, "%s %s\r", jm.Status, jm.Progress) fmt.Fprintf(out, "%s %s%s", jm.Status, jm.Progress, endl)
} else { } else {
fmt.Fprintf(out, "%s\r\n", jm.Status) fmt.Fprintf(out, "%s%s\n", jm.Status, endl)
} }
return nil return nil
} }
func DisplayJSONMessagesStream(in io.Reader, out io.Writer) error { func DisplayJSONMessagesStream(in io.Reader, out io.Writer, isTerminal bool) error {
dec := json.NewDecoder(in) dec := json.NewDecoder(in)
ids := make(map[string]int) ids := make(map[string]int)
diff := 0 diff := 0
@ -825,11 +830,17 @@ func DisplayJSONMessagesStream(in io.Reader, out io.Writer) error {
} else { } else {
diff = len(ids) - line diff = len(ids) - line
} }
fmt.Fprintf(out, "%c[%dA", 27, diff) if isTerminal {
// <ESC>[{diff}A = move cursor up diff rows
fmt.Fprintf(out, "%c[%dA", 27, diff)
}
} }
err := jm.Display(out) err := jm.Display(out, isTerminal)
if jm.ID != "" { if jm.ID != "" {
fmt.Fprintf(out, "%c[%dB", 27, diff) if isTerminal {
// <ESC>[{diff}B = move cursor down diff rows
fmt.Fprintf(out, "%c[%dB", 27, diff)
}
} }
if err != nil { if err != nil {
return err return err