From b5ffee022a776a2f5265b702a3417bbdabbdc23f Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Mon, 2 Mar 2026 12:02:27 -0600 Subject: [PATCH] use GetStringSlice in osc.message.create --- internal/processor/osc-message-create.go | 67 +++++++++---------- .../processor/test/osc-message-create_test.go | 4 +- 2 files changed, 32 insertions(+), 39 deletions(-) diff --git a/internal/processor/osc-message-create.go b/internal/processor/osc-message-create.go index fbbc11a..319b0d5 100644 --- a/internal/processor/osc-message-create.go +++ b/internal/processor/osc-message-create.go @@ -78,8 +78,8 @@ func (omc *OSCMessageCreate) Type() string { func init() { RegisterProcessor(ProcessorRegistration{ Type: "osc.message.create", - New: func(config config.ProcessorConfig) (Processor, error) { - params := config.Params + New: func(processorConfig config.ProcessorConfig) (Processor, error) { + params := processorConfig.Params addressString, err := params.GetString("address") if err != nil { return nil, fmt.Errorf("osc.message.create address error: %w", err) @@ -91,43 +91,36 @@ func init() { return nil, err } - args, ok := params["args"] - - if ok { - rawArgs, ok := args.([]interface{}) - - if !ok { - return nil, fmt.Errorf("osc.message.create address must be an array found %T", args) + argStrings, err := params.GetStringSlice("args") + if err != nil { + if errors.Is(err, config.ErrParamNotFound) { + return &OSCMessageCreate{config: processorConfig, Address: addressTemplate}, nil + } else { + return nil, fmt.Errorf("osc.message.create args error: %w", err) } - - typesString, err := params.GetString("types") - if err != nil { - return nil, fmt.Errorf("osc.message.create types error: %w", err) - } - - if len(rawArgs) != len(typesString) { - return nil, errors.New("osc.message.create args and types must be the same length") - } - - argTemplates := []*template.Template{} - - for _, rawArg := range rawArgs { - argString, ok := rawArg.(string) - - if !ok { - return nil, errors.New("osc.message.create arg error: not a string") - } - - argTemplate, err := template.New("arg").Parse(argString) - - if err != nil { - return nil, err - } - argTemplates = append(argTemplates, argTemplate) - } - return &OSCMessageCreate{config: config, Address: addressTemplate, Args: argTemplates, Types: typesString}, nil } - return &OSCMessageCreate{config: config, Address: addressTemplate}, nil + + typesString, err := params.GetString("types") + if err != nil { + return nil, fmt.Errorf("osc.message.create types error: %w", err) + } + + if len(argStrings) != len(typesString) { + return nil, errors.New("osc.message.create args and types must be the same length") + } + + argTemplates := []*template.Template{} + + for _, argString := range argStrings { + + argTemplate, err := template.New("arg").Parse(argString) + + if err != nil { + return nil, err + } + argTemplates = append(argTemplates, argTemplate) + } + return &OSCMessageCreate{config: processorConfig, Address: addressTemplate, Args: argTemplates, Types: typesString}, nil }, }) } diff --git a/internal/processor/test/osc-message-create_test.go b/internal/processor/test/osc-message-create_test.go index 512aabb..fcf0ebc 100644 --- a/internal/processor/test/osc-message-create_test.go +++ b/internal/processor/test/osc-message-create_test.go @@ -211,7 +211,7 @@ func TestBadOSCMessageCreate(t *testing.T) { "types": "s", }, payload: "test", - errorString: "osc.message.create address must be an array found string", + errorString: "osc.message.create args error: not a slice", }, { name: "args without types parameter", @@ -240,7 +240,7 @@ func TestBadOSCMessageCreate(t *testing.T) { "types": "ss", }, payload: "test", - errorString: "osc.message.create arg error: not a string", + errorString: "osc.message.create args error: element at index 1 is not a string", }, { name: "bad arg template",