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

Use VT100 escape codes

Browse source 
:
This commit is contained in:
Victor Vieux 2013-07-24 20:16:02 +00:00
parent 8742649aa7
commit f1dd299227
2 changed files with 38 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
commands.go
View file

@ -1536,19 +1536,7 @@ func (cli *DockerCli) stream(method, path string, in io.Reader, out io.Writer) e
}
if resp.Header.Get("Content-Type") == "application/json" {
dec := json.NewDecoder(resp.Body)
jm := utils.JSONMessage{}
for {
if err := dec.Decode(&jm); err == io.EOF {
break
} else if err != nil {
return err
}
jm.Display(out)
}
if jm.Progress != "" {
fmt.Fprintf(out, "\n")
}
utils.DisplayJSONMessagesStream(resp.Body, out)
} else {
if _, err := io.Copy(out, resp.Body); err != nil {
return err

38
utils/utils.go
View file

@ -617,6 +617,7 @@ func (jm *JSONMessage) Display(out io.Writer) (error) {
if jm.Error != "" {
return fmt.Errorf(jm.Error)
}
fmt.Fprintf(out, "%c[2K", 27)
if jm.Time != 0 {
fmt.Fprintf(out, "[%s] ", time.Unix(jm.Time, 0))
}
@ -626,8 +627,43 @@ func (jm *JSONMessage) Display(out io.Writer) (error) {
if jm.Progress != "" {
fmt.Fprintf(out, "%s %s\r", jm.Status, jm.Progress)
} else {
fmt.Fprintf(out, "%s\n", jm.Status)
fmt.Fprintf(out, "%s\r", jm.Status)
}
if jm.ID == "" {
fmt.Fprintf(out, "\n")
}
return nil
}
func DisplayJSONMessagesStream(in io.Reader, out io.Writer) error {
dec := json.NewDecoder(in)
jm := JSONMessage{}
ids := make(map[string]int)
diff := 0
for {
if err := dec.Decode(&jm); err == io.EOF {
break
} else if err != nil {
return err
}
if jm.ID != "" {
line, ok := ids[jm.ID]
if !ok {
line = len(ids)
ids[jm.ID] = line
fmt.Fprintf(out, "\n")
diff = 0
} else {
diff = len(ids) - line
}
fmt.Fprintf(out, "%c[%dA", 27, diff)
}
jm.Display(out)
if jm.ID != "" {
fmt.Fprintf(out, "%c[%dB", 27, diff)
}
}
// fmt.Fprintf(out, "\n")
return nil
}