From b4a63f8c600fd419af33f4791220c403d36d89cd Mon Sep 17 00:00:00 2001 From: Sergey Ponomarev Date: Tue, 24 Nov 2020 22:19:29 +0200 Subject: [PATCH 1/6] docker_logs.go: use time.RFC3339Nano constant --- connector/collector/docker_logs.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connector/collector/docker_logs.go b/connector/collector/docker_logs.go index 84cdd14..fc569ee 100644 --- a/connector/collector/docker_logs.go +++ b/connector/collector/docker_logs.go @@ -74,12 +74,12 @@ func (l *DockerLogs) Stream() chan models.Log { func (l *DockerLogs) Stop() { l.done <- true } func (l *DockerLogs) parseTime(s string) time.Time { - ts, err := time.Parse("2006-01-02T15:04:05.000000000Z", s) + ts, err := time.Parse(time.RFC3339Nano, s) if err == nil { return ts } - ts, err2 := time.Parse("2006-01-02T15:04:05.000000000Z", l.stripPfx(s)) + ts, err2 := time.Parse(time.RFC3339Nano, l.stripPfx(s)) if err2 == nil { return ts } From 6c662d91fbab191afb69d059b58741d69d5c1a78 Mon Sep 17 00:00:00 2001 From: Sergey Ponomarev Date: Wed, 25 Nov 2020 19:15:32 +0200 Subject: [PATCH 2/6] docker.go shortName() use TrimPrefix() --- connector/docker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connector/docker.go b/connector/docker.go index 063392f..0e30c12 100644 --- a/connector/docker.go +++ b/connector/docker.go @@ -290,5 +290,5 @@ func (cm *Docker) All() (containers container.Containers) { // use primary container name func shortName(name string) string { - return strings.Replace(name, "/", "", 1) + return strings.TrimPrefix(name, "/") } From 948e7cc9d000395ff9fccb874e215e2b7542b3ad Mon Sep 17 00:00:00 2001 From: Sergey Ponomarev Date: Thu, 26 Nov 2020 12:08:36 +0200 Subject: [PATCH 3/6] docker_logs.go use SplitN(2) --- connector/collector/docker_logs.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connector/collector/docker_logs.go b/connector/collector/docker_logs.go index fc569ee..d8b7559 100644 --- a/connector/collector/docker_logs.go +++ b/connector/collector/docker_logs.go @@ -47,9 +47,9 @@ func (l *DockerLogs) Stream() chan models.Log { go func() { scanner := bufio.NewScanner(r) for scanner.Scan() { - parts := strings.Split(scanner.Text(), " ") + parts := strings.SplitN(scanner.Text(), " ", 2) ts := l.parseTime(parts[0]) - logCh <- models.Log{Timestamp: ts, Message: strings.Join(parts[1:], " ")} + logCh <- models.Log{Timestamp: ts, Message: parts[1]} } }() From 4e44c9d5f768145bd5aba2d3d71e65e281f9a90c Mon Sep 17 00:00:00 2001 From: Sergey Ponomarev Date: Thu, 26 Nov 2020 12:08:55 +0200 Subject: [PATCH 4/6] file.go use filepath.Dir() --- config/file.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/config/file.go b/config/file.go index b8851e4..6282fd1 100644 --- a/config/file.go +++ b/config/file.go @@ -3,6 +3,7 @@ package config import ( "fmt" "os" + "path/filepath" "regexp" "strings" @@ -81,7 +82,7 @@ func Write() (path string, err error) { return path, err } - cfgdir := basedir(path) + cfgdir := filepath.Dir(path) // create config dir if not exist if _, err := os.Stat(cfgdir); err != nil { err = os.MkdirAll(cfgdir, 0755) @@ -141,8 +142,3 @@ func xdgSupport() bool { } return false } - -func basedir(path string) string { - parts := strings.Split(path, "/") - return strings.Join((parts[0 : len(parts)-1]), "/") -} From a59c7aab3c4469d1e0281fc4245617bf51bc319c Mon Sep 17 00:00:00 2001 From: Sergey Ponomarev Date: Fri, 27 Nov 2020 22:28:58 +0200 Subject: [PATCH 5/6] Fix: enable pause [p] only for running or paused container --- menus.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menus.go b/menus.go index 4e0cd6a..47f6b9c 100644 --- a/menus.go +++ b/menus.go @@ -258,7 +258,7 @@ func ContainerMenu() MenuFn { ui.StopLoop() }) } - if c.Meta["state"] != "exited" || c.Meta["state"] != "created" { + if c.Meta["state"] != "exited" && c.Meta["state"] != "created" { ui.Handle("/sys/kbd/p", func(ui.Event) { if c.Meta["state"] == "paused" { selected = "unpause" From fa254c652c0a0b6634036a77617656b40ce35e85 Mon Sep 17 00:00:00 2001 From: Sergey Ponomarev Date: Fri, 27 Nov 2020 22:34:55 +0200 Subject: [PATCH 6/6] Columns settings: add hint for re-order columns --- menus.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menus.go b/menus.go index 47f6b9c..8176c6f 100644 --- a/menus.go +++ b/menus.go @@ -130,7 +130,7 @@ func ColumnsMenu() MenuFn { m.Selectable = true m.SortItems = false m.BorderLabel = "Columns" - //m.SubText = "Enabled Columns" + m.SubText = "Re-order: / " rebuild := func() { // get padding for right alignment of enabled status