From 1e94f1606fefd2cb2f5b8cb4c1111ca4ebb6844e Mon Sep 17 00:00:00 2001 From: "Gustavo L de Mello (Guz)" Date: Mon, 13 Jan 2025 15:09:20 -0300 Subject: [PATCH] refactor(blogo,multi-renderer): change options polarity so zero-value is default value --- blogo/blogo.go | 7 +++---- blogo/renderer.go | 20 +++++--------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/blogo/blogo.go b/blogo/blogo.go index 9c04f62..a9fcff2 100644 --- a/blogo/blogo.go +++ b/blogo/blogo.go @@ -175,11 +175,10 @@ func (b *Blogo) render(src fs.File, w io.Writer) error { log.Debug("Multiple renderers found, initializing built-in multi-renderer plugin") - f, t := false, true multi := NewMultiRenderer(MultiRendererOpts{ - SkipOnError: &f, - PanicOnInit: &t, - Logger: log, + NotSkipOnError: false, + NotPanicOnInit: true, + Logger: log, }) for _, r := range b.renderers { diff --git a/blogo/renderer.go b/blogo/renderer.go index 14026ac..46b82ce 100644 --- a/blogo/renderer.go +++ b/blogo/renderer.go @@ -28,9 +28,9 @@ type multiRenderer struct { } type MultiRendererOpts struct { - SkipOnError *bool - PanicOnInit *bool - Logger *slog.Logger + NotSkipOnError bool + NotPanicOnInit bool + Logger *slog.Logger } func NewMultiRenderer(opts ...MultiRendererOpts) MultiRenderer { @@ -39,16 +39,6 @@ func NewMultiRenderer(opts ...MultiRendererOpts) MultiRenderer { opt = opts[0] } - if opt.SkipOnError == nil { - d := true - opt.SkipOnError = &d - } - - if opt.PanicOnInit == nil { - d := true - opt.PanicOnInit = &d - } - if opt.Logger == nil { opt.Logger = slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{})) } @@ -57,8 +47,8 @@ func NewMultiRenderer(opts ...MultiRendererOpts) MultiRenderer { return &multiRenderer{ renderers: []RendererPlugin{}, - skipOnError: *opt.SkipOnError, - panicOnInit: *opt.PanicOnInit, + skipOnError: !opt.NotSkipOnError, + panicOnInit: !opt.NotPanicOnInit, log: opt.Logger, }