From 7eff8412f34a6bb74f34ca9e844403844e82e404 Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Tue, 9 Sep 2025 11:05:33 -0400 Subject: [PATCH] Switch to using json for a 'no dependencies' project. --- .ozai.json | 8 ++++++++ .ozai.toml | 6 ------ config/settings.go | 22 ++++++++++------------ main.go | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 .ozai.json delete mode 100644 .ozai.toml diff --git a/.ozai.json b/.ozai.json new file mode 100644 index 0000000..a8c1f00 --- /dev/null +++ b/.ozai.json @@ -0,0 +1,8 @@ +{ + "Processes": { + "ssgod": { + "Name": "ssgod", + "Command": "ssgod" + } + } +} diff --git a/.ozai.toml b/.ozai.toml deleted file mode 100644 index 915484d..0000000 --- a/.ozai.toml +++ /dev/null @@ -1,6 +0,0 @@ - -[commands.ssgod] -Command="ssgod" - -[commands.echo] -Command="ssgod" diff --git a/config/settings.go b/config/settings.go index 81cefd4..baaf08f 100644 --- a/config/settings.go +++ b/config/settings.go @@ -3,7 +3,9 @@ package config import ( "flag" "log" - "github.com/BurntSushi/toml" + "os" + "fmt" + "encoding/json" ) type command struct { @@ -11,29 +13,25 @@ type command struct { } type config struct { - Commands map[string]command + Processes map[string]command ConfigPath string } var Settings config func parseFlags(c *config) { - flag.StringVar(&c.ConfigPath, "config", ".ozai.toml", ".ozai.toml to load") + flag.StringVar(&c.ConfigPath, "config", ".ozai.json", ".ozai.json to load") flag.Parse() } func Load() { parseFlags(&Settings) - metadata, err := toml.DecodeFile(Settings.ConfigPath, &Settings) + the_fucking_data, err := os.ReadFile(Settings.ConfigPath) + if err != nil { log.Fatal(err) } - if err != nil { - log.Fatalf("error loading config.toml: %v", err) - } + fmt.Printf("%s\n", the_fucking_data) - bad_keys := metadata.Undecoded() - - if len(bad_keys) > 0 { - log.Fatalf("unknown configuration keys: %v", bad_keys); - } + err = json.Unmarshal(the_fucking_data, &Settings) + if err != nil { log.Fatal(err) } } diff --git a/main.go b/main.go index 5188713..7208d88 100644 --- a/main.go +++ b/main.go @@ -12,9 +12,9 @@ func main() { config.Load() fmt.Println("CONFIG:", config.Settings.ConfigPath) - fmt.Println("COMMANDs:", config.Settings.Commands) + fmt.Println("COMMANDs:", config.Settings.Processes) - cmd := exec.Command(config.Settings.Commands["ssgod"].Command) + cmd := exec.Command(config.Settings.Processes["ssgod"].Command) if errors.Is(cmd.Err, exec.ErrDot) { cmd.Err = nil }