From 86dfebdeafde30e96591d6816a0d0db81169c67c Mon Sep 17 00:00:00 2001 From: Pieter van de Bruggen Date: Wed, 3 Jul 2019 10:59:45 -0700 Subject: [PATCH] Replace Project panel content with the project directory. In the future, it may be worth trying to compute this from ComposeFiles. --- main.go | 7 ++++++- pkg/config/app_config.go | 4 +++- pkg/gui/project_panel.go | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index 9c05b7c8..68dac33e 100644 --- a/main.go +++ b/main.go @@ -46,7 +46,12 @@ func main() { os.Exit(0) } - appConfig, err := config.NewAppConfig("lazydocker", version, commit, date, buildSource, debuggingFlag, composeFiles) + projectDir, err := os.Getwd() + if err != nil { + log.Fatal(err.Error()) + } + + appConfig, err := config.NewAppConfig("lazydocker", version, commit, date, buildSource, debuggingFlag, composeFiles, projectDir) if err != nil { log.Fatal(err.Error()) } diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go index 3976ad98..8c4ca92c 100644 --- a/pkg/config/app_config.go +++ b/pkg/config/app_config.go @@ -362,10 +362,11 @@ type AppConfig struct { BuildSource string `long:"build-source" env:"BUILD_SOURCE" default:""` UserConfig *UserConfig ConfigDir string + ProjectDir string } // NewAppConfig makes a new app config -func NewAppConfig(name, version, commit, date string, buildSource string, debuggingFlag bool, composeFiles []string) (*AppConfig, error) { +func NewAppConfig(name, version, commit, date string, buildSource string, debuggingFlag bool, composeFiles []string, projectDir string) (*AppConfig, error) { configDir, err := findOrCreateConfigDir(name) if err != nil { return nil, err @@ -390,6 +391,7 @@ func NewAppConfig(name, version, commit, date string, buildSource string, debugg BuildSource: buildSource, UserConfig: userConfig, ConfigDir: configDir, + ProjectDir: projectDir, } return appConfig, nil diff --git a/pkg/gui/project_panel.go b/pkg/gui/project_panel.go index e143e5f6..88b5897e 100644 --- a/pkg/gui/project_panel.go +++ b/pkg/gui/project_panel.go @@ -3,6 +3,7 @@ package gui import ( "bytes" "fmt" + "path" "strings" "github.com/fatih/color" @@ -30,9 +31,11 @@ func (gui *Gui) getProjectContextTitles() []string { func (gui *Gui) refreshProject() error { v := gui.getProjectView() + dirName := path.Base(gui.Config.ProjectDir) + gui.g.Update(func(*gocui.Gui) error { v.Clear() - fmt.Fprint(v, "lazydocker") + fmt.Fprint(v, dirName) return nil })