beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

uses the terminal size to display search output, add -notrunc and fix bug in resize

Browse source
This commit is contained in:
Victor Vieux 2013-07-08 17:20:13 +00:00
parent 70480ce7bc
commit fd97190ee7
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
commands.go
View file

@ -1101,6 +1101,7 @@ func (cli *DockerCli) CmdAttach(args ...string) error {
func (cli *DockerCli) CmdSearch(args ...string) error { func (cli *DockerCli) CmdSearch(args ...string) error {
cmd := Subcmd("search", "NAME", "Search the docker index for images") cmd := Subcmd("search", "NAME", "Search the docker index for images")
noTrunc := cmd.Bool("notrunc", false, "Don't truncate output")
if err := cmd.Parse(args); err != nil { if err := cmd.Parse(args); err != nil {
return nil return nil
} }
@ -1122,13 +1123,19 @@ func (cli *DockerCli) CmdSearch(args ...string) error {
return err return err
} }
fmt.Fprintf(cli.out, "Found %d results matching your query (\"%s\")\n", len(outs), cmd.Arg(0)) fmt.Fprintf(cli.out, "Found %d results matching your query (\"%s\")\n", len(outs), cmd.Arg(0))
w := tabwriter.NewWriter(cli.out, 20, 1, 3, ' ', 0) w := tabwriter.NewWriter(cli.out, 33, 1, 3, ' ', 0)
fmt.Fprintf(w, "NAME\tDESCRIPTION\n") fmt.Fprintf(w, "NAME\tDESCRIPTION\n")
_, width := cli.getTtySize()
if width == 0 {
width = 45
} else {
width = width - 33 //remote the first column
}
for _, out := range outs { for _, out := range outs {
desc := strings.Replace(out.Description, "\n", " ", -1) desc := strings.Replace(out.Description, "\n", " ", -1)
desc = strings.Replace(desc, "\r", " ", -1) desc = strings.Replace(desc, "\r", " ", -1)
if len(desc) > 45 { if !*noTrunc && len(desc) > width {
desc = utils.Trunc(desc, 42) + "..." desc = utils.Trunc(desc, width-3) + "..."
} }
fmt.Fprintf(w, "%s\t%s\n", out.Name, desc) fmt.Fprintf(w, "%s\t%s\n", out.Name, desc)
} }
@ -1502,17 +1509,25 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea
} }
func (cli *DockerCli) resizeTty(id string) { func (cli *DockerCli) getTtySize() (int, int) {
if !cli.isTerminal { if !cli.isTerminal {
return return 0, 0
} }
ws, err := term.GetWinsize(cli.terminalFd) ws, err := term.GetWinsize(cli.terminalFd)
if err != nil { if err != nil {
utils.Debugf("Error getting size: %s", err) utils.Debugf("Error getting size: %s", err)
} }
return int(ws.Height), int(ws.Width)
}
func (cli *DockerCli) resizeTty(id string) {
height, width := cli.getTtySize()
if height == 0 && width == 0 {
return
}
v := url.Values{} v := url.Values{}
v.Set("h", strconv.Itoa(int(ws.Height))) v.Set("h", strconv.Itoa(height))
v.Set("w", strconv.Itoa(int(ws.Width))) v.Set("w", strconv.Itoa(width))
if _, _, err := cli.call("POST", "/containers/"+id+"/resize?"+v.Encode(), nil); err != nil { if _, _, err := cli.call("POST", "/containers/"+id+"/resize?"+v.Encode(), nil); err != nil {
utils.Debugf("Error resize: %s", err) utils.Debugf("Error resize: %s", err)
} }

2
term/term.go
View file

@ -12,8 +12,8 @@ type State struct {
} }
type Winsize struct { type Winsize struct {
Width uint16
Height uint16 Height uint16
Width uint16
x uint16 x uint16
y uint16 y uint16
} }