✨ Allow formatters to use sub-config with their own config structs

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) {
+func newJson(ff *viper.Viper) (Formatter, error) {
-	prettyPrint := false
+	js := new(Json)
-	if jf, ok := ff["json"].(map[string]any); ok {
+	err := ff.Unmarshal(js)
-		if pp, ok := jf["pretty_print"].(bool); ok {
+	if err != nil {
-			prettyPrint = pp
+		return nil, fmt.Errorf("failed to get json config: %w", err)
 	}
-	}
+	return js, nil
-	return &Json{prettyPrint}, nil
 }
 
 type Json struct {
-	prettPrint bool
+	prettPrint bool `mapstructure:"pretty_print"`
 }
 
 func (js *Json) Name() string {

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)
+	v, _ := config.RetrieveFromContext(ctx)
-	conf := c.Formatters
+	formatterConf := v.Sub("formatters." + kind)
 
-	if make, ok := formatterMap[kind]; ok {
+	if maker, ok := formatterMap[kind]; ok {
-		var formatterConf map[string]any
+		return maker(formatterConf)
-		if cf, ok := conf[kind]; ok {
-			formatterConf = cf
-		}
-		return make(formatterConf)
 	}
 
-	return nil, errors.New("unimplemented")
+	return nil, fmt.Errorf("unimplemented format: %s", kind)
 }
 
 func Kinds() []string {

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
 }
 

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
 }