From 942d1b18bdd76cec63fdb8c0b73e95b8fee12811 Mon Sep 17 00:00:00 2001 From: onyx-and-iris Date: Tue, 10 Feb 2026 01:24:55 +0000 Subject: [PATCH] keep validation failure messages consistent. they now print the incorrect value passed. --- cmd/x32-cli/bus.go | 2 +- cmd/x32-cli/main.go | 2 +- cmd/x32-cli/mainmono.go | 2 +- cmd/x32-cli/matrix.go | 4 ++-- cmd/x32-cli/strip.go | 2 +- cmd/xair-cli/bus.go | 2 +- cmd/xair-cli/main.go | 2 +- cmd/xair-cli/strip.go | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/x32-cli/bus.go b/cmd/x32-cli/bus.go index 1cda18d..896a15b 100644 --- a/cmd/x32-cli/bus.go +++ b/cmd/x32-cli/bus.go @@ -187,7 +187,7 @@ func (cmd *BusEqCmdGroup) Validate() error { } if cmd.Band.Band < 1 || cmd.Band.Band > 6 { - return fmt.Errorf("EQ band number must be between 1 and 6") + return fmt.Errorf("EQ band number must be between 1 and 6, got %d", cmd.Band.Band) } return nil } diff --git a/cmd/x32-cli/main.go b/cmd/x32-cli/main.go index 3064b83..fc6a37a 100644 --- a/cmd/x32-cli/main.go +++ b/cmd/x32-cli/main.go @@ -150,7 +150,7 @@ func (cmd *MainEqCmdGroup) Validate() error { } if cmd.Band.Band < 1 || cmd.Band.Band > 6 { - return fmt.Errorf("invalid EQ band number: %d. Valid range is 1-6", cmd.Band.Band) + return fmt.Errorf("EQ band number must be between 1 and 6, got %d", cmd.Band.Band) } return nil } diff --git a/cmd/x32-cli/mainmono.go b/cmd/x32-cli/mainmono.go index 4fa08e5..ccb30f5 100644 --- a/cmd/x32-cli/mainmono.go +++ b/cmd/x32-cli/mainmono.go @@ -150,7 +150,7 @@ func (cmd *MainMonoEqCmdGroup) Validate() error { } if cmd.Band.Band < 1 || cmd.Band.Band > 6 { - return fmt.Errorf("invalid EQ band number: %d. Valid range is 1-6", cmd.Band.Band) + return fmt.Errorf("EQ band number must be between 1 and 6, got %d", cmd.Band.Band) } return nil } diff --git a/cmd/x32-cli/matrix.go b/cmd/x32-cli/matrix.go index 82dd865..791a843 100644 --- a/cmd/x32-cli/matrix.go +++ b/cmd/x32-cli/matrix.go @@ -22,7 +22,7 @@ type MatrixCmdGroup struct { func (cmd *MatrixCmdGroup) Validate() error { if cmd.Index.Index < 1 || cmd.Index.Index > 6 { - return fmt.Errorf("invalid Matrix output index: %d. Valid range is 1-6", cmd.Index.Index) + return fmt.Errorf("Matrix output index must be between 1 and 6, got %d", cmd.Index.Index) } return nil } @@ -160,7 +160,7 @@ func (cmd *MatrixEqCmdGroup) Validate() error { } if cmd.Band.Band < 1 || cmd.Band.Band > 6 { - return fmt.Errorf("invalid EQ band number: %d. Valid range is 1-6", cmd.Band.Band) + return fmt.Errorf("EQ band number must be between 1 and 6, got %d", cmd.Band.Band) } return nil } diff --git a/cmd/x32-cli/strip.go b/cmd/x32-cli/strip.go index f80e5d1..fe0ac52 100644 --- a/cmd/x32-cli/strip.go +++ b/cmd/x32-cli/strip.go @@ -378,7 +378,7 @@ func (cmd *StripEqCmdGroup) Validate() error { } if cmd.Band.Band < 1 || cmd.Band.Band > 4 { - return fmt.Errorf("EQ band number must be between 1 and 4") + return fmt.Errorf("EQ band number must be between 1 and 4, got %d", cmd.Band.Band) } return nil } diff --git a/cmd/xair-cli/bus.go b/cmd/xair-cli/bus.go index 8b6b03e..887ed5b 100644 --- a/cmd/xair-cli/bus.go +++ b/cmd/xair-cli/bus.go @@ -188,7 +188,7 @@ func (cmd *BusEqCmdGroup) Validate() error { } if cmd.Band.Band < 1 || cmd.Band.Band > 6 { - return fmt.Errorf("EQ band number must be between 1 and 6") + return fmt.Errorf("EQ band number must be between 1 and 6, got %d", cmd.Band.Band) } return nil } diff --git a/cmd/xair-cli/main.go b/cmd/xair-cli/main.go index 3064b83..fc6a37a 100644 --- a/cmd/xair-cli/main.go +++ b/cmd/xair-cli/main.go @@ -150,7 +150,7 @@ func (cmd *MainEqCmdGroup) Validate() error { } if cmd.Band.Band < 1 || cmd.Band.Band > 6 { - return fmt.Errorf("invalid EQ band number: %d. Valid range is 1-6", cmd.Band.Band) + return fmt.Errorf("EQ band number must be between 1 and 6, got %d", cmd.Band.Band) } return nil } diff --git a/cmd/xair-cli/strip.go b/cmd/xair-cli/strip.go index f80e5d1..fe0ac52 100644 --- a/cmd/xair-cli/strip.go +++ b/cmd/xair-cli/strip.go @@ -378,7 +378,7 @@ func (cmd *StripEqCmdGroup) Validate() error { } if cmd.Band.Band < 1 || cmd.Band.Band > 4 { - return fmt.Errorf("EQ band number must be between 1 and 4") + return fmt.Errorf("EQ band number must be between 1 and 4, got %d", cmd.Band.Band) } return nil }