Merge pull request #34 from skanehira/develop

Added features of container attach and asynchronous operation

Author: skanehira

README.md

@@ -14,6 +14,7 @@ docui can do thises.
     - start/stop
     - export/commit
     - inspect/rename/filtering
+    - attach
 
 - volume
     - create/remove/prune

common/common.go

@@ -11,10 +11,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/davecgh/go-spew/spew"
 	docker "github.com/fsouza/go-dockerclient"
 	"github.com/jroimartin/gocui"
 )
 
+var cutNewlineReplacer = strings.NewReplacer("\r", "", "\n", "")
+
 func StructToJson(i interface{}) string {
 	j, err := json.Marshal(i)
 	if err != nil {
@@ -55,15 +58,27 @@ func OutputFormatedLine(v *gocui.View, i interface{}) {
 	parseLength := func(cw int, str string) (int, int) {
 		minMax := strings.Split(str, " ")
 
+		if len(minMax) < 2 {
+			return -1, -1
+		}
+
 		min, _ := strconv.ParseFloat(strings.Split(minMax[0], ":")[1], 64)
 		max, _ := strconv.ParseFloat(strings.Split(minMax[1], ":")[1], 64)
 		return int(float64(cw) * min), int(float64(cw) * max)
 	}
 
 	for i := 0; i < size; i++ {
-		value := elem.Field(i).Interface().(string)
+		value, ok := elem.Field(i).Interface().(string)
+		if !ok {
+			continue
+		}
 		max, min := parseLength(cw, elem.Type().Field(i).Tag.Get("len"))
 
+		// skip if can not get the tag
+		if max == -1 && min == -1 {
+			continue
+		}
+
 		if max < min {
 			max = min
 		}
@@ -92,7 +107,9 @@ func OutputFormatedHeader(v *gocui.View, i interface{}) {
 		tag := field.Tag.Get("tag")
 		name := field.Name
 
-		elem.FieldByName(name).SetString(tag)
+		if field.Type.Kind() == reflect.String {
+			elem.FieldByName(name).SetString(tag)
+		}
 	}
 
 	OutputFormatedLine(v, i)
@@ -137,3 +154,20 @@ func ParseLabels(labels map[string]string) string {
 
 	return result
 }
+
+func DateNow() string {
+	return time.Now().Format("2006/01/02 15:04:05")
+}
+
+func CutNewline(i string) string {
+	return cutNewlineReplacer.Replace(i)
+}
+
+func DebugOutput(i interface{}) {
+	file, err := os.OpenFile("/tmp/docui.log", os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
+	if err != nil {
+		return
+	}
+	defer file.Close()
+	fmt.Fprintln(file, spew.Sdump(i))
+}

main.go

@@ -1,16 +1,25 @@
 package main
 
 import (
+	"os"
+
 	"github.com/skanehira/docui/panel"
 
 	"github.com/jroimartin/gocui"
 )
 
 func main() {
-	gui := panel.New(gocui.Output256)
-	defer gui.Close()
+	for {
+		gui := panel.New(gocui.Output256)
+		err := gui.MainLoop()
 
-	if err := gui.MainLoop(); err != nil && err != gocui.ErrQuit {
-		panic(err)
+		switch err {
+		case gocui.ErrQuit:
+			gui.Close()
+			os.Exit(0)
+		case panel.AttachFlag:
+			gui.Close()
+			gui.Panels[panel.ContainerListPanel].(*panel.ContainerList).Attach()
+		}
 	}
 }

panel/containerPanel.go

@@ -3,6 +3,7 @@ package panel
 import (
 	"fmt"
 	"os"
+	"os/exec"
 	"strings"
 	"time"
 
@@ -147,6 +148,9 @@ func (c *ContainerList) SetKeyBinding() {
 	if err := c.SetKeybinding(c.name, 'f', gocui.ModNone, c.Filter); err != nil {
 		panic(err)
 	}
+	if err := c.SetKeybinding(c.name, 'a', gocui.ModNone, c.AttachContainer); err != nil {
+		panic(err)
+	}
 }
 
 func (c *ContainerList) selected() (*Container, error) {
@@ -220,24 +224,11 @@ func (c *ContainerList) StartContainer(g *gocui.Gui, v *gocui.View) error {
 		return nil
 	}
 
-	g.Update(func(g *gocui.Gui) error {
-		c.StateMessage("container starting...")
-
-		g.Update(func(g *gocui.Gui) error {
-			defer c.Refresh(g, v)
-			defer c.CloseStateMessage()
-
-			if err := c.Docker.StartContainerWithID(container.ID); err != nil {
-				c.ErrMessage(err.Error(), c.name)
-				return nil
-			}
-
-			c.SwitchPanel(c.name)
-
-			return nil
-		})
-
-		return nil
+	c.AddTask(fmt.Sprintf("Start container %s", container.Name), func() error {
+		if err := c.Docker.StartContainerWithID(container.ID); err != nil {
+			return err
+		}
+		return c.Refresh(g, v)
 	})
 
 	return nil
@@ -250,24 +241,11 @@ func (c *ContainerList) StopContainer(g *gocui.Gui, v *gocui.View) error {
 		return nil
 	}
 
-	g.Update(func(g *gocui.Gui) error {
-		c.StateMessage("container stopping...")
-
-		g.Update(func(g *gocui.Gui) error {
-			defer c.CloseStateMessage()
-			defer c.Refresh(g, v)
-
-			if err := c.Docker.StopContainerWithID(container.ID); err != nil {
-				c.ErrMessage(err.Error(), c.name)
-				return nil
-			}
-
-			c.SwitchPanel(c.name)
-
-			return nil
-		})
-
-		return nil
+	c.AddTask(fmt.Sprintf("Stop container %s", container.Name), func() error {
+		if err := c.Docker.StopContainerWithID(container.ID); err != nil {
+			return err
+		}
+		return c.Refresh(g, v)
 	})
 
 	return nil
@@ -320,37 +298,23 @@ func (c *ContainerList) ExportContainer(g *gocui.Gui, v *gocui.View) error {
 	}
 
 	data := c.form.GetFieldTexts()
+	container := data["Container"]
+	path := data["Path"]
 
-	g.Update(func(g *gocui.Gui) error {
-		c.form.Close(g, v)
-		c.StateMessage("container exporting...")
-
-		g.Update(func(g *gocui.Gui) error {
-			defer c.CloseStateMessage()
-
-			file, err := os.OpenFile(data["Path"], os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0666)
-			if err != nil {
-				c.ErrMessage(err.Error(), c.name)
-				return nil
-			}
-			defer file.Close()
-
-			options := docker.ExportContainerOptions{
-				ID:           data["Container"],
-				OutputStream: file,
-			}
-
-			if err := c.Docker.ExportContainerWithOptions(options); err != nil {
-				c.ErrMessage(err.Error(), c.name)
-				return nil
-			}
+	c.form.Close(g, v)
 
-			c.SwitchPanel(c.name)
-
-			return nil
+	c.AddTask(fmt.Sprintf("Export container %s to %s", container, path), func() error {
+		file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0666)
+		if err != nil {
+			return err
+		}
+		defer file.Close()
 
-		})
-		return nil
+		options := docker.ExportContainerOptions{
+			ID:           container,
+			OutputStream: file,
+		}
+		return c.Docker.ExportContainerWithOptions(options)
 	})
 
 	return nil
@@ -408,32 +372,23 @@ func (c *ContainerList) CommitContainer(g *gocui.Gui, v *gocui.View) error {
 		data["Tag"] = "latest"
 	}
 
+	container := data["Container"]
+	repository := data["Repository"]
+	tag := data["Tag"]
+
 	options := docker.CommitContainerOptions{
-		Container:  data["Container"],
-		Repository: data["Repository"],
-		Tag:        data["Tag"],
+		Container:  container,
+		Repository: repository,
+		Tag:        tag,
 	}
 
-	g.Update(func(g *gocui.Gui) error {
-		c.form.Close(g, v)
-		c.StateMessage("container committing...")
-
-		g.Update(func(g *gocui.Gui) error {
-			defer c.CloseStateMessage()
+	c.form.Close(g, v)
 
-			if err := c.Docker.CommitContainerWithOptions(options); err != nil {
-				c.ErrMessage(err.Error(), c.name)
-				return nil
-			}
-
-			c.Panels[ImageListPanel].Refresh(g, v)
-			c.SwitchPanel(c.name)
-
-			return nil
-
-		})
-
-		return nil
+	c.AddTask(fmt.Sprintf("Commit container %s to %s", container, repository+":"+tag), func() error {
+		if err := c.Docker.CommitContainerWithOptions(options); err != nil {
+			return err
+		}
+		return c.Refresh(g, v)
 	})
 
 	return nil
@@ -485,32 +440,21 @@ func (c *ContainerList) RenameContainer(g *gocui.Gui, v *gocui.View) error {
 	}
 
 	data := c.form.GetFieldTexts()
+	oldName := data["Container"]
+	name := data["NewName"]
 
 	options := docker.RenameContainerOptions{
-		ID:   data["Container"],
-		Name: data["NewName"],
+		ID:   oldName,
+		Name: name,
 	}
 
-	g.Update(func(g *gocui.Gui) error {
-		c.form.Close(g, v)
-		c.StateMessage("container renaming...")
-
-		g.Update(func(g *gocui.Gui) error {
-			defer c.CloseStateMessage()
-
-			if err := c.Docker.RenameContainerWithOptions(options); err != nil {
-				c.ErrMessage(err.Error(), c.name)
-				return nil
-			}
+	c.form.Close(g, v)
 
-			c.Refresh(g, v)
-			c.SwitchPanel(c.name)
-
-			return nil
-
-		})
-
-		return nil
+	c.AddTask(fmt.Sprintf("Rename container %s to %s", oldName, name), func() error {
+		if err := c.Docker.RenameContainerWithOptions(options); err != nil {
+			return err
+		}
+		return c.Refresh(g, v)
 	})
 
 	return nil
@@ -597,3 +541,23 @@ func (c *ContainerList) Filter(g *gocui.Gui, lv *gocui.View) error {
 
 	return nil
 }
+
+func (c *ContainerList) AttachContainer(g *gocui.Gui, v *gocui.View) error {
+	return AttachFlag
+}
+
+func (c *ContainerList) Attach() error {
+	selected, err := c.selected()
+	if err != nil {
+		return err
+	}
+
+	cmd := exec.Command("docker", "attach", selected.ID)
+
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	cmd.Run()
+
+	return nil
+}