Skip to content

struct: support additional fields after StructReflector encountered #365

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
maxenglander wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −5
Open

struct: support additional fields after StructReflector encountered #365

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
5 changes: 4 additions & 1 deletion struct.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,10 @@ func (s *Section) reflectFrom(val reflect.Value) error {
}

if r, ok := field.Interface().(StructReflector); ok {
return r.ReflectINIStruct(s.f)
if err := r.ReflectINIStruct(s.f); err != nil {
return err
}
continue
}

fieldName := s.parseFieldName(tpField.Name, rawName)
Expand Down
25 changes: 21 additions & 4 deletions struct_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,8 @@ func Test_ReflectFromStruct(t *testing.T) {

ti, err := time.Parse(time.RFC3339, "1993-10-07T20:17:05Z")
require.NoError(t, err)
a := &Author{"Unknwon", true, nil, 21, 100, 2.8, ti, "", "ignored",
a := &Author{
"Unknwon", true, nil, 21, 100, 2.8, ti, "", "ignored",
&Embeded{
[]time.Time{ti, ti},
[]string{"HangZhou", "Boston"},
Expand All @@ -521,7 +522,8 @@ func Test_ReflectFromStruct(t *testing.T) {
[]float64{192.168, 10.11},
[]bool{true, false},
[]int{},
}}
},
}
cfg := Empty()
assert.NoError(t, ReflectFrom(cfg, a))

Expand Down Expand Up @@ -779,8 +781,10 @@ path = /tmp/gpm-profiles/test1.profile
shadow := &ShadowStruct{
StringArray: []string{"s1", "s2"},
Allowshadow: []string{"s3", "s4"},
Dates: []time.Time{time.Date(2020, 9, 12, 00, 00, 00, 651387237, time.UTC),
time.Date(2020, 9, 12, 00, 00, 00, 651387237, time.UTC)},
Dates: []time.Time{
time.Date(2020, 9, 12, 00, 00, 00, 651387237, time.UTC),
time.Date(2020, 9, 12, 00, 00, 00, 651387237, time.UTC),
},
Places: []string{"HangZhou", "Boston"},
Years: []int{1993, 1994},
Numbers: []int64{10010, 10086},
Expand Down Expand Up @@ -857,6 +861,10 @@ func Test_Duration(t *testing.T) {
})
}

type Address struct {
Line1, Line2 string
}

type Employer struct {
Name string
Title string
Expand All @@ -877,6 +885,7 @@ func Test_StructReflector(t *testing.T) {
p := &struct {
FirstName string
Employer Employers
Address Address
}{
FirstName: "Andrew",
Employer: []*Employer{
Expand All @@ -889,6 +898,10 @@ func Test_StructReflector(t *testing.T) {
Title: "Consultant Engineer",
},
},
Address: Address{
Line1: "123 Ini Drive",
Line2: "Section 1",
},
}

f := Empty()
Expand All @@ -905,6 +918,10 @@ Title = Staff II Engineer

[Employer "EMC"]
Title = Consultant Engineer

[Address]
Line1 = 123 Ini Drive
Line2 = Section 1
`,
buf.String(),
)
Expand Down