From 05adcdfcd328aaa9519339cf60b9f4d6c902828c Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 31 Jul 2025 20:28:29 +0100 Subject: [PATCH] Refactor --- internal/config/config.go | 40 +++++++++++++++++++++++++++++++++++++++ main.go | 38 +++++-------------------------------- 2 files changed, 45 insertions(+), 33 deletions(-) create mode 100644 internal/config/config.go diff --git a/internal/config/config.go b/internal/config/config.go new file mode 100644 index 0000000..79e8271 --- /dev/null +++ b/internal/config/config.go @@ -0,0 +1,40 @@ +package config + +import ( + "fmt" + "os" + "path/filepath" + + "gopkg.in/yaml.v3" +) + +type Config struct { + Directories []string `yaml:"directories"` +} + +func getConfigPath() (string, error) { + home, err := os.UserHomeDir() + if err != nil { + return "", err + } + return filepath.Join(home, ".config", "git-repo-updater", "config.yaml"), nil +} + +func Load() (Config, error) { + path, err := getConfigPath() + if err != nil { + return Config{}, err + } + data, err := os.ReadFile(path) + if err != nil { + return Config{}, fmt.Errorf("read config: %w", err) + } + var cfg Config + if err := yaml.Unmarshal(data, &cfg); err != nil { + return Config{}, fmt.Errorf("parse config: %w", err) + } + if len(cfg.Directories) == 0 { + return Config{}, fmt.Errorf("no directories configured") + } + return cfg, nil +} diff --git a/main.go b/main.go index b5f4d70..54b6911 100644 --- a/main.go +++ b/main.go @@ -2,45 +2,17 @@ package main import ( "fmt" - "os" - "path/filepath" + "log" - "gopkg.in/yaml.v3" + "git-repo-updater/internal/config" ) -type Config struct { - Directories []string `yaml:"directories"` -} - -func getConfigPath() string { - home, err := os.UserHomeDir() - - if err != nil { - panic(err) - } - - return filepath.Join(home, ".config", "git-repo-updater", "config.yaml") -} - func main() { - configPath := getConfigPath() - data, err := os.ReadFile(configPath) + cfg, err := config.Load() if err != nil { - panic(err) + log.Fatalf("Failed to load config: %v", err) } - config := parseConfig(data) - - fmt.Println("Directories:", config.Directories) -} - -func parseConfig(data []byte) Config { - var config Config - - if err := yaml.Unmarshal(data, &config); err != nil { - panic(err) - } - - return config + fmt.Println("Directories:", cfg.Directories) }