From c8cfef858c1be476f0520ef083a5185935aabd5f Mon Sep 17 00:00:00 2001 From: onyx-and-iris Date: Sun, 15 Feb 2026 14:58:59 +0000 Subject: [PATCH] enable goconst linter add package level constants for true/false str values --- .golangci.yml | 2 +- cmd/x32-cli/bus.go | 6 +++--- cmd/x32-cli/cli.go | 5 +++++ cmd/x32-cli/dca.go | 2 +- cmd/x32-cli/headamp.go | 10 +++++----- cmd/x32-cli/main.go | 10 +++++----- cmd/x32-cli/mainmono.go | 10 +++++----- cmd/x32-cli/matrix.go | 10 +++++----- cmd/x32-cli/strip.go | 8 ++++---- cmd/xair-cli/bus.go | 6 +++--- cmd/xair-cli/cli.go | 5 +++++ cmd/xair-cli/dca.go | 2 +- cmd/xair-cli/headamp.go | 10 +++++----- cmd/xair-cli/main.go | 10 +++++----- cmd/xair-cli/strip.go | 8 ++++---- 15 files changed, 57 insertions(+), 47 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index ea64cae..27ea162 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -6,7 +6,7 @@ run: go: '1.24' linters: - disable: [dupl, errcheck, goconst] + disable: [dupl, errcheck] enable: # Default enabled linters - errcheck # Check for unchecked errors diff --git a/cmd/x32-cli/bus.go b/cmd/x32-cli/bus.go index f6d0fcc..61ac5a5 100644 --- a/cmd/x32-cli/bus.go +++ b/cmd/x32-cli/bus.go @@ -36,7 +36,7 @@ func (cmd *BusMuteCmd) Run(ctx *context, bus *BusCmdGroup) error { return nil } - if err := ctx.Client.Bus.SetMute(bus.Index.Index, *cmd.State == "true"); err != nil { + if err := ctx.Client.Bus.SetMute(bus.Index.Index, *cmd.State == trueStr); err != nil { return err } fmt.Fprintf(ctx.Out, "Bus %d mute state set to: %s\n", bus.Index.Index, *cmd.State) @@ -218,7 +218,7 @@ func (cmd *BusEqOnCmd) Run(ctx *context, bus *BusCmdGroup) error { return nil } - if err := ctx.Client.Bus.Eq.SetOn(bus.Index.Index, *cmd.State == "true"); err != nil { + if err := ctx.Client.Bus.Eq.SetOn(bus.Index.Index, *cmd.State == trueStr); err != nil { return err } fmt.Fprintf(ctx.Out, "Bus %d EQ on state set to: %s\n", bus.Index.Index, *cmd.State) @@ -421,7 +421,7 @@ func (cmd *BusCompOnCmd) Run(ctx *context, bus *BusCmdGroup) error { return nil } - if err := ctx.Client.Bus.Comp.SetOn(bus.Index.Index, *cmd.State == "true"); err != nil { + if err := ctx.Client.Bus.Comp.SetOn(bus.Index.Index, *cmd.State == trueStr); err != nil { return err } fmt.Fprintf(ctx.Out, "Bus %d compressor on state set to: %s\n", bus.Index.Index, *cmd.State) diff --git a/cmd/x32-cli/cli.go b/cmd/x32-cli/cli.go index eefea50..d300255 100644 --- a/cmd/x32-cli/cli.go +++ b/cmd/x32-cli/cli.go @@ -15,6 +15,11 @@ import ( "github.com/onyx-and-iris/xair-cli/internal/xair" ) +const ( + trueStr = "true" + falseStr = "false" +) + var version string // Version of the CLI, set at build time. // VersionFlag is a custom flag type that prints the version and exits. diff --git a/cmd/x32-cli/dca.go b/cmd/x32-cli/dca.go index a478018..5d00e0b 100644 --- a/cmd/x32-cli/dca.go +++ b/cmd/x32-cli/dca.go @@ -36,7 +36,7 @@ func (cmd *DCAMuteCmd) Run(ctx *context, dca *DCACmdGroup) error { return nil } - if err := ctx.Client.DCA.SetMute(dca.Index.Index, *cmd.State == "true"); err != nil { + if err := ctx.Client.DCA.SetMute(dca.Index.Index, *cmd.State == trueStr); err != nil { return fmt.Errorf("failed to set DCA mute status: %w", err) } return nil diff --git a/cmd/x32-cli/headamp.go b/cmd/x32-cli/headamp.go index 68e756a..8ea19e1 100644 --- a/cmd/x32-cli/headamp.go +++ b/cmd/x32-cli/headamp.go @@ -106,10 +106,10 @@ type HeadampPhantomCmd struct { func (cmd *HeadampPhantomCmd) Validate() error { if cmd.State != nil { switch *cmd.State { - case "true", "on": - *cmd.State = "true" - case "false", "off": - *cmd.State = "false" + case trueStr, "on": + *cmd.State = trueStr + case falseStr, "off": + *cmd.State = falseStr default: return fmt.Errorf("invalid phantom power state: %s", *cmd.State) } @@ -130,7 +130,7 @@ func (cmd *HeadampPhantomCmd) Run(ctx *context, headamp *HeadampCmdGroup) error if err := ctx.Client.HeadAmp.SetPhantomPower( headamp.Index.Index, - *cmd.State == "true", + *cmd.State == trueStr, ); err != nil { return fmt.Errorf("failed to set headamp phantom power state: %w", err) } diff --git a/cmd/x32-cli/main.go b/cmd/x32-cli/main.go index faaaabb..52ada99 100644 --- a/cmd/x32-cli/main.go +++ b/cmd/x32-cli/main.go @@ -34,7 +34,7 @@ func (cmd *MainMuteCmd) Run(ctx *context) error { return nil } - if err := ctx.Client.Main.SetMute(*cmd.Mute == "true"); err != nil { + if err := ctx.Client.Main.SetMute(*cmd.Mute == trueStr); err != nil { return fmt.Errorf("failed to set Main L/R mute state: %w", err) } fmt.Fprintf(ctx.Out, "Main L/R mute state set to: %s\n", *cmd.Mute) @@ -172,10 +172,10 @@ func (cmd *MainEqOnCmd) Run(ctx *context) error { return nil } - if err := ctx.Client.Main.Eq.SetOn(0, *cmd.Enable == "true"); err != nil { + if err := ctx.Client.Main.Eq.SetOn(0, *cmd.Enable == trueStr); err != nil { return fmt.Errorf("failed to set Main L/R EQ on/off state: %w", err) } - fmt.Fprintf(ctx.Out, "Main L/R EQ on/off state set to: %t\n", *cmd.Enable == "true") + fmt.Fprintf(ctx.Out, "Main L/R EQ on/off state set to: %t\n", *cmd.Enable == trueStr) return nil } @@ -318,10 +318,10 @@ func (cmd *MainCompOnCmd) Run(ctx *context) error { return nil } - if err := ctx.Client.Main.Comp.SetOn(0, *cmd.Enable == "true"); err != nil { + if err := ctx.Client.Main.Comp.SetOn(0, *cmd.Enable == trueStr); err != nil { return fmt.Errorf("failed to set Main L/R compressor on/off state: %w", err) } - fmt.Fprintf(ctx.Out, "Main L/R compressor on/off state set to: %t\n", *cmd.Enable == "true") + fmt.Fprintf(ctx.Out, "Main L/R compressor on/off state set to: %t\n", *cmd.Enable == trueStr) return nil } diff --git a/cmd/x32-cli/mainmono.go b/cmd/x32-cli/mainmono.go index bd384c7..2e8646b 100644 --- a/cmd/x32-cli/mainmono.go +++ b/cmd/x32-cli/mainmono.go @@ -33,7 +33,7 @@ func (cmd *MainMonoMuteCmd) Run(ctx *context) error { return nil } - if err := ctx.Client.MainMono.SetMute(*cmd.Mute == "true"); err != nil { + if err := ctx.Client.MainMono.SetMute(*cmd.Mute == trueStr); err != nil { return fmt.Errorf("failed to set Main Mono mute state: %w", err) } fmt.Fprintf(ctx.Out, "Main Mono mute state set to: %s\n", *cmd.Mute) @@ -171,10 +171,10 @@ func (cmd *MainMonoEqOnCmd) Run(ctx *context) error { return nil } - if err := ctx.Client.MainMono.Eq.SetOn(0, *cmd.Enable == "true"); err != nil { + if err := ctx.Client.MainMono.Eq.SetOn(0, *cmd.Enable == trueStr); err != nil { return fmt.Errorf("failed to set Main Mono EQ on/off state: %w", err) } - fmt.Fprintf(ctx.Out, "Main Mono EQ on/off state set to: %t\n", *cmd.Enable == "true") + fmt.Fprintf(ctx.Out, "Main Mono EQ on/off state set to: %t\n", *cmd.Enable == trueStr) return nil } @@ -337,10 +337,10 @@ func (cmd *MainMonoCompOnCmd) Run(ctx *context) error { return nil } - if err := ctx.Client.MainMono.Comp.SetOn(0, *cmd.Enable == "true"); err != nil { + if err := ctx.Client.MainMono.Comp.SetOn(0, *cmd.Enable == trueStr); err != nil { return fmt.Errorf("failed to set Main Mono compressor on/off state: %w", err) } - fmt.Fprintf(ctx.Out, "Main Mono compressor on/off state set to: %t\n", *cmd.Enable == "true") + fmt.Fprintf(ctx.Out, "Main Mono compressor on/off state set to: %t\n", *cmd.Enable == trueStr) return nil } diff --git a/cmd/x32-cli/matrix.go b/cmd/x32-cli/matrix.go index b763e5e..edf2884 100644 --- a/cmd/x32-cli/matrix.go +++ b/cmd/x32-cli/matrix.go @@ -43,7 +43,7 @@ func (cmd *MatrixMuteCmd) Run(ctx *context, matrix *MatrixCmdGroup) error { return nil } - if err := ctx.Client.Matrix.SetMute(matrix.Index.Index, *cmd.Mute == "true"); err != nil { + if err := ctx.Client.Matrix.SetMute(matrix.Index.Index, *cmd.Mute == trueStr); err != nil { return fmt.Errorf("failed to set Matrix mute state: %w", err) } fmt.Fprintf(ctx.Out, "Matrix mute state set to: %s\n", *cmd.Mute) @@ -181,10 +181,10 @@ func (cmd *MatrixEqOnCmd) Run(ctx *context, matrix *MatrixCmdGroup) error { return nil } - if err := ctx.Client.Matrix.Eq.SetOn(matrix.Index.Index, *cmd.Enable == "true"); err != nil { + if err := ctx.Client.Matrix.Eq.SetOn(matrix.Index.Index, *cmd.Enable == trueStr); err != nil { return fmt.Errorf("failed to set Matrix EQ on/off state: %w", err) } - fmt.Fprintf(ctx.Out, "Matrix EQ on/off state set to: %t\n", *cmd.Enable == "true") + fmt.Fprintf(ctx.Out, "Matrix EQ on/off state set to: %t\n", *cmd.Enable == trueStr) return nil } @@ -359,10 +359,10 @@ func (cmd *MatrixCompOnCmd) Run(ctx *context, matrix *MatrixCmdGroup) error { return nil } - if err := ctx.Client.Matrix.Comp.SetOn(matrix.Index.Index, *cmd.Enable == "true"); err != nil { + if err := ctx.Client.Matrix.Comp.SetOn(matrix.Index.Index, *cmd.Enable == trueStr); err != nil { return fmt.Errorf("failed to set Matrix compressor on/off state: %w", err) } - fmt.Fprintf(ctx.Out, "Matrix compressor on/off state set to: %t\n", *cmd.Enable == "true") + fmt.Fprintf(ctx.Out, "Matrix compressor on/off state set to: %t\n", *cmd.Enable == trueStr) return nil } diff --git a/cmd/x32-cli/strip.go b/cmd/x32-cli/strip.go index 7edf35f..18c8198 100644 --- a/cmd/x32-cli/strip.go +++ b/cmd/x32-cli/strip.go @@ -38,7 +38,7 @@ func (cmd *StripMuteCmd) Run(ctx *context, strip *StripCmdGroup) error { return nil } - if err := ctx.Client.Strip.SetMute(strip.Index.Index, *cmd.State == "true"); err != nil { + if err := ctx.Client.Strip.SetMute(strip.Index.Index, *cmd.State == trueStr); err != nil { return fmt.Errorf("failed to set mute state: %w", err) } fmt.Fprintf(ctx.Out, "Strip %d mute state set to: %s\n", strip.Index.Index, *cmd.State) @@ -242,7 +242,7 @@ func (cmd *StripGateOnCmd) Run(ctx *context, strip *StripCmdGroup) error { return nil } - if err := ctx.Client.Strip.Gate.SetOn(strip.Index.Index, *cmd.Enable == "true"); err != nil { + if err := ctx.Client.Strip.Gate.SetOn(strip.Index.Index, *cmd.Enable == trueStr); err != nil { return fmt.Errorf("failed to set gate state: %w", err) } fmt.Fprintf(ctx.Out, "Strip %d gate state set to: %s\n", strip.Index.Index, *cmd.Enable) @@ -442,7 +442,7 @@ func (cmd *StripEqOnCmd) Run(ctx *context, strip *StripCmdGroup) error { return nil } - if err := ctx.Client.Strip.Eq.SetOn(strip.Index.Index, *cmd.Enable == "true"); err != nil { + if err := ctx.Client.Strip.Eq.SetOn(strip.Index.Index, *cmd.Enable == trueStr); err != nil { return fmt.Errorf("failed to set EQ state: %w", err) } fmt.Fprintf(ctx.Out, "Strip %d EQ state set to: %s\n", strip.Index.Index, *cmd.Enable) @@ -646,7 +646,7 @@ func (cmd *StripCompOnCmd) Run(ctx *context, strip *StripCmdGroup) error { return nil } - if err := ctx.Client.Strip.Comp.SetOn(strip.Index.Index, *cmd.Enable == "true"); err != nil { + if err := ctx.Client.Strip.Comp.SetOn(strip.Index.Index, *cmd.Enable == trueStr); err != nil { return fmt.Errorf("failed to set compressor state: %w", err) } fmt.Fprintf(ctx.Out, "Strip %d compressor state set to: %s\n", strip.Index.Index, *cmd.Enable) diff --git a/cmd/xair-cli/bus.go b/cmd/xair-cli/bus.go index 43dc38e..e0edef8 100644 --- a/cmd/xair-cli/bus.go +++ b/cmd/xair-cli/bus.go @@ -36,7 +36,7 @@ func (cmd *BusMuteCmd) Run(ctx *context, bus *BusCmdGroup) error { return nil } - if err := ctx.Client.Bus.SetMute(bus.Index.Index, *cmd.State == "true"); err != nil { + if err := ctx.Client.Bus.SetMute(bus.Index.Index, *cmd.State == trueStr); err != nil { return err } fmt.Fprintf(ctx.Out, "Bus %d mute state set to: %s\n", bus.Index.Index, *cmd.State) @@ -218,7 +218,7 @@ func (cmd *BusEqOnCmd) Run(ctx *context, bus *BusCmdGroup) error { return nil } - if err := ctx.Client.Bus.Eq.SetOn(bus.Index.Index, *cmd.State == "true"); err != nil { + if err := ctx.Client.Bus.Eq.SetOn(bus.Index.Index, *cmd.State == trueStr); err != nil { return err } fmt.Fprintf(ctx.Out, "Bus %d EQ on state set to: %s\n", bus.Index.Index, *cmd.State) @@ -421,7 +421,7 @@ func (cmd *BusCompOnCmd) Run(ctx *context, bus *BusCmdGroup) error { return nil } - if err := ctx.Client.Bus.Comp.SetOn(bus.Index.Index, *cmd.State == "true"); err != nil { + if err := ctx.Client.Bus.Comp.SetOn(bus.Index.Index, *cmd.State == trueStr); err != nil { return err } fmt.Fprintf(ctx.Out, "Bus %d compressor on state set to: %s\n", bus.Index.Index, *cmd.State) diff --git a/cmd/xair-cli/cli.go b/cmd/xair-cli/cli.go index 1ed4105..ddd332c 100644 --- a/cmd/xair-cli/cli.go +++ b/cmd/xair-cli/cli.go @@ -15,6 +15,11 @@ import ( "github.com/onyx-and-iris/xair-cli/internal/xair" ) +const ( + trueStr = "true" + falseStr = "false" +) + var version string // Version of the CLI, set at build time. // VersionFlag is a custom flag type that prints the version and exits. diff --git a/cmd/xair-cli/dca.go b/cmd/xair-cli/dca.go index 55a690c..df0342e 100644 --- a/cmd/xair-cli/dca.go +++ b/cmd/xair-cli/dca.go @@ -37,7 +37,7 @@ func (cmd *DCAMuteCmd) Run(ctx *context, dca *DCACmdGroup) error { return nil } - if err := ctx.Client.DCA.SetMute(dca.Index.Index, *cmd.State == "true"); err != nil { + if err := ctx.Client.DCA.SetMute(dca.Index.Index, *cmd.State == trueStr); err != nil { return fmt.Errorf("failed to set DCA mute status: %w", err) } return nil diff --git a/cmd/xair-cli/headamp.go b/cmd/xair-cli/headamp.go index 68e756a..8ea19e1 100644 --- a/cmd/xair-cli/headamp.go +++ b/cmd/xair-cli/headamp.go @@ -106,10 +106,10 @@ type HeadampPhantomCmd struct { func (cmd *HeadampPhantomCmd) Validate() error { if cmd.State != nil { switch *cmd.State { - case "true", "on": - *cmd.State = "true" - case "false", "off": - *cmd.State = "false" + case trueStr, "on": + *cmd.State = trueStr + case falseStr, "off": + *cmd.State = falseStr default: return fmt.Errorf("invalid phantom power state: %s", *cmd.State) } @@ -130,7 +130,7 @@ func (cmd *HeadampPhantomCmd) Run(ctx *context, headamp *HeadampCmdGroup) error if err := ctx.Client.HeadAmp.SetPhantomPower( headamp.Index.Index, - *cmd.State == "true", + *cmd.State == trueStr, ); err != nil { return fmt.Errorf("failed to set headamp phantom power state: %w", err) } diff --git a/cmd/xair-cli/main.go b/cmd/xair-cli/main.go index 579b533..6aac14f 100644 --- a/cmd/xair-cli/main.go +++ b/cmd/xair-cli/main.go @@ -34,7 +34,7 @@ func (cmd *MainMuteCmd) Run(ctx *context) error { return nil } - if err := ctx.Client.Main.SetMute(*cmd.Mute == "true"); err != nil { + if err := ctx.Client.Main.SetMute(*cmd.Mute == trueStr); err != nil { return fmt.Errorf("failed to set Main L/R mute state: %w", err) } fmt.Fprintf(ctx.Out, "Main L/R mute state set to: %s\n", *cmd.Mute) @@ -172,10 +172,10 @@ func (cmd *MainEqOnCmd) Run(ctx *context) error { return nil } - if err := ctx.Client.Main.Eq.SetOn(0, *cmd.Enable == "true"); err != nil { + if err := ctx.Client.Main.Eq.SetOn(0, *cmd.Enable == trueStr); err != nil { return fmt.Errorf("failed to set Main L/R EQ on/off state: %w", err) } - fmt.Fprintf(ctx.Out, "Main L/R EQ on/off state set to: %t\n", *cmd.Enable == "true") + fmt.Fprintf(ctx.Out, "Main L/R EQ on/off state set to: %t\n", *cmd.Enable == trueStr) return nil } @@ -318,10 +318,10 @@ func (cmd *MainCompOnCmd) Run(ctx *context) error { return nil } - if err := ctx.Client.Main.Comp.SetOn(0, *cmd.Enable == "true"); err != nil { + if err := ctx.Client.Main.Comp.SetOn(0, *cmd.Enable == trueStr); err != nil { return fmt.Errorf("failed to set Main L/R compressor on/off state: %w", err) } - fmt.Fprintf(ctx.Out, "Main L/R compressor on/off state set to: %t\n", *cmd.Enable == "true") + fmt.Fprintf(ctx.Out, "Main L/R compressor on/off state set to: %t\n", *cmd.Enable == trueStr) return nil } diff --git a/cmd/xair-cli/strip.go b/cmd/xair-cli/strip.go index 2eed11c..39979fd 100644 --- a/cmd/xair-cli/strip.go +++ b/cmd/xair-cli/strip.go @@ -38,7 +38,7 @@ func (cmd *StripMuteCmd) Run(ctx *context, strip *StripCmdGroup) error { return nil } - if err := ctx.Client.Strip.SetMute(strip.Index.Index, *cmd.State == "true"); err != nil { + if err := ctx.Client.Strip.SetMute(strip.Index.Index, *cmd.State == trueStr); err != nil { return fmt.Errorf("failed to set mute state: %w", err) } fmt.Fprintf(ctx.Out, "Strip %d mute state set to: %s\n", strip.Index.Index, *cmd.State) @@ -242,7 +242,7 @@ func (cmd *StripGateOnCmd) Run(ctx *context, strip *StripCmdGroup) error { return nil } - if err := ctx.Client.Strip.Gate.SetOn(strip.Index.Index, *cmd.Enable == "true"); err != nil { + if err := ctx.Client.Strip.Gate.SetOn(strip.Index.Index, *cmd.Enable == trueStr); err != nil { return fmt.Errorf("failed to set gate state: %w", err) } fmt.Fprintf(ctx.Out, "Strip %d gate state set to: %s\n", strip.Index.Index, *cmd.Enable) @@ -442,7 +442,7 @@ func (cmd *StripEqOnCmd) Run(ctx *context, strip *StripCmdGroup) error { return nil } - if err := ctx.Client.Strip.Eq.SetOn(strip.Index.Index, *cmd.Enable == "true"); err != nil { + if err := ctx.Client.Strip.Eq.SetOn(strip.Index.Index, *cmd.Enable == trueStr); err != nil { return fmt.Errorf("failed to set EQ state: %w", err) } fmt.Fprintf(ctx.Out, "Strip %d EQ state set to: %s\n", strip.Index.Index, *cmd.Enable) @@ -646,7 +646,7 @@ func (cmd *StripCompOnCmd) Run(ctx *context, strip *StripCmdGroup) error { return nil } - if err := ctx.Client.Strip.Comp.SetOn(strip.Index.Index, *cmd.Enable == "true"); err != nil { + if err := ctx.Client.Strip.Comp.SetOn(strip.Index.Index, *cmd.Enable == trueStr); err != nil { return fmt.Errorf("failed to set compressor state: %w", err) } fmt.Fprintf(ctx.Out, "Strip %d compressor state set to: %s\n", strip.Index.Index, *cmd.Enable)