From 6c6a959af4b814de6c77d46e99e83a0105074ffd Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Sun, 8 Mar 2026 23:29:36 -0500
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Allow=20formatters=20to=20use=20sub?=
 =?UTF-8?q?-config=20with=20their=20own=20config=20structs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 formatters/json.go  | 17 +++++++++--------
 formatters/new.go   | 19 ++++++++-----------
 formatters/null.go  |  3 ++-
 formatters/plain.go |  3 ++-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/formatters/json.go b/formatters/json.go
index f75f9cb..e79acab 100644
--- a/formatters/json.go
+++ b/formatters/json.go
@@ -3,23 +3,24 @@ package formatters
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"time"
 
 	"codeberg.org/danjones000/my-log/models"
+	"github.com/spf13/viper"
 )
 
-func newJson(ff map[string]any) (Formatter, error) {
-	prettyPrint := false
-	if jf, ok := ff["json"].(map[string]any); ok {
-		if pp, ok := jf["pretty_print"].(bool); ok {
-			prettyPrint = pp
-		}
+func newJson(ff *viper.Viper) (Formatter, error) {
+	js := new(Json)
+	err := ff.Unmarshal(js)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get json config: %w", err)
 	}
-	return &Json{prettyPrint}, nil
+	return js, nil
 }
 
 type Json struct {
-	prettPrint bool
+	prettPrint bool `mapstructure:"pretty_print"`
 }
 
 func (js *Json) Name() string {
diff --git a/formatters/new.go b/formatters/new.go
index 0aa41f1..96692ef 100644
--- a/formatters/new.go
+++ b/formatters/new.go
@@ -2,12 +2,13 @@ package formatters
 
 import (
 	"context"
-	"errors"
+	"fmt"
 
 	"codeberg.org/danjones000/my-log/config"
+	"github.com/spf13/viper"
 )
 
-type formatMaker func(config map[string]any) (Formatter, error)
+type formatMaker func(config *viper.Viper) (Formatter, error)
 
 var formatterMap = map[string]formatMaker{
 	"plain": newPlain,
@@ -22,18 +23,14 @@ func Preferred(ctx context.Context) (f Formatter, err error) {
 }
 
 func New(ctx context.Context, kind string) (f Formatter, err error) {
-	_, c := config.RetrieveFromContext(ctx)
-	conf := c.Formatters
+	v, _ := config.RetrieveFromContext(ctx)
+	formatterConf := v.Sub("formatters." + kind)
 
-	if make, ok := formatterMap[kind]; ok {
-		var formatterConf map[string]any
-		if cf, ok := conf[kind]; ok {
-			formatterConf = cf
-		}
-		return make(formatterConf)
+	if maker, ok := formatterMap[kind]; ok {
+		return maker(formatterConf)
 	}
 
-	return nil, errors.New("unimplemented")
+	return nil, fmt.Errorf("unimplemented format: %s", kind)
 }
 
 func Kinds() []string {
diff --git a/formatters/null.go b/formatters/null.go
index 5b0f3aa..f83cbde 100644
--- a/formatters/null.go
+++ b/formatters/null.go
@@ -2,9 +2,10 @@ package formatters
 
 import (
 	"codeberg.org/danjones000/my-log/models"
+	"github.com/spf13/viper"
 )
 
-func newNull(ff map[string]any) (Formatter, error) {
+func newNull(ff *viper.Viper) (Formatter, error) {
 	return &Null{}, nil
 }
 
diff --git a/formatters/plain.go b/formatters/plain.go
index 6211b77..0a94f81 100644
--- a/formatters/plain.go
+++ b/formatters/plain.go
@@ -5,9 +5,10 @@ import (
 
 	"codeberg.org/danjones000/my-log/models"
 	"codeberg.org/danjones000/my-log/tools"
+	"github.com/spf13/viper"
 )
 
-func newPlain(ff map[string]any) (Formatter, error) {
+func newPlain(ff *viper.Viper) (Formatter, error) {
 	return &PlainText{}, nil
 }