backup/showbridge-go
1
0
Fork 0
mirror of https://github.com/jwetzell/showbridge-go.git synced 2026-04-26 21:05:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

use GetStringSlice in osc.message.create

Browse Source
This commit is contained in:
Joel Wetzell
2026-03-02 12:02:27 -06:00
parent cd264d9ed4
commit b5ffee022a
2 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
internal/processor/osc-message-create.go
View File

@@ -78,8 +78,8 @@ func (omc *OSCMessageCreate) Type() string {
func init() { func init() {
RegisterProcessor(ProcessorRegistration{ RegisterProcessor(ProcessorRegistration{
Type: "osc.message.create", Type: "osc.message.create",
New: func(config config.ProcessorConfig) (Processor, error) { New: func(processorConfig config.ProcessorConfig) (Processor, error) {
params := config.Params params := processorConfig.Params
addressString, err := params.GetString("address") addressString, err := params.GetString("address")
if err != nil { if err != nil {
return nil, fmt.Errorf("osc.message.create address error: %w", err) return nil, fmt.Errorf("osc.message.create address error: %w", err)
@@ -91,43 +91,36 @@ func init() {
return nil, err return nil, err
} }
args, ok := params["args"] argStrings, err := params.GetStringSlice("args")
if err != nil {
if ok { if errors.Is(err, config.ErrParamNotFound) {
rawArgs, ok := args.([]interface{}) return &OSCMessageCreate{config: processorConfig, Address: addressTemplate}, nil
} else {
if !ok { return nil, fmt.Errorf("osc.message.create args error: %w", err)
return nil, fmt.Errorf("osc.message.create address must be an array found %T", args)
} }
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
}, },
}) })
} }

4
internal/processor/test/osc-message-create_test.go
View File

@@ -211,7 +211,7 @@ func TestBadOSCMessageCreate(t *testing.T) {
"types": "s", "types": "s",
}, },
payload: "test", 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", name: "args without types parameter",
@@ -240,7 +240,7 @@ func TestBadOSCMessageCreate(t *testing.T) {
"types": "ss", "types": "ss",
}, },
payload: "test", 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", name: "bad arg template",