Skip to content

Fix config path lookup for fields with omitempty json tags #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phyceClaw wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix config path lookup for fields with omitempty json tags #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app/config/internal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package config

import (
"reflect"
"strings"
)

func findFieldByJSONTag(dest reflect.Value, jsonTag string) (reflect.Value, bool) {
Expand All @@ -10,7 +11,11 @@ func findFieldByJSONTag(dest reflect.Value, jsonTag string) (reflect.Value, bool
field := dest.Field(i)
fieldType := destType.Field(i)
tag := fieldType.Tag.Get("json")
if tag == jsonTag {
name := strings.SplitN(tag, ",", 2)[0]
if name == "" || name == "-" {
continue
}
if name == jsonTag {
return field, true
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/config/structs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ type AudioCacheSettings struct {

type ServerSettings struct {
Auth AuthSettings `json:"auth,omitempty"`
Engines ServerSettingsEngines `json:"engines, omitempty"`
Engines ServerSettingsEngines `json:"engines,omitempty"`
}
type ServerSettingsEngines struct {
Piper map[string]ModelInstances `json:"piper,omitempty"`
Expand Down