From dff4d455e07d639b82a0bed814f41d0656e9b6d0 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 21 Sep 2024 14:03:45 +0300 Subject: cleanup --- internal/config/client/client.go | 41 ---------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 internal/config/client/client.go (limited to 'internal/config/client/client.go') diff --git a/internal/config/client/client.go b/internal/config/client/client.go deleted file mode 100644 index f551686..0000000 --- a/internal/config/client/client.go +++ /dev/null @@ -1,41 +0,0 @@ -package client - -import ( - "fmt" - "log" - "os" - - "codeberg.org/snonux/gos/internal/config" -) - -type ClientConfig struct { - Servers []string `json:"Servers,omitempty"` - APIKey string `json:"APIKey,omitempty"` - Editor string `json:"Editor,omitempty"` - DataDir string `json:"StateDir,omitempty"` - ComposeFile string `json:"ComposeFile,omitempty"` - LogFile string `json:"LogFile,omitempty"` -} - -func New(configFile string) (ClientConfig, error) { - conf, err := config.FromFile[ClientConfig](configFile) - if err != nil { - if _, ok := err.(*os.PathError); !ok { - return conf, err - } - log.Println("Skipping config file:", err) - } - - conf.Servers = config.StrSlice("GOS_SERVERS", conf.Servers) - conf.APIKey = config.Str("GOS_API_KEY", conf.APIKey) - conf.Editor = config.Str("GOS_EDITOR", "EDITOR", conf.Editor, "vi") - - defaultDataDir := fmt.Sprintf("%s/.gos/data", os.Getenv("HOME")) - conf.DataDir = config.Str("GOS_DATA_DIR", conf.DataDir, defaultDataDir) - conf.ComposeFile = config.Str("GOS_COMPOSE_FILE", conf.ComposeFile, "compose.txt") - - defaultLogFile := fmt.Sprintf("%s/.gos/gos.log", os.Getenv("HOME")) - conf.LogFile = config.Str("GOS_LOG_FILE", conf.LogFile, defaultLogFile) - - return conf, nil -} -- cgit v1.2.3