Skip to content

struct: preserve embedded values in non-unique sections #421

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

Closed
Narek-Khachikyan wants to merge 1 commit into from
Closed

struct: preserve embedded values in non-unique sections #421

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
3 changes: 3 additions & 0 deletions struct.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,9 @@ func (s *Section) reflectFrom(val reflect.Value) error {
if err != nil {
// Note: fieldName can never be empty here, ignore error.
sec, _ = s.f.NewSection(fieldName)
} else if sec.name == s.name {
// Keep fields in the current occurrence of a non-unique section.
sec = s
}

// Add comment from comment tag
Expand Down
33 changes: 33 additions & 0 deletions struct_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,39 @@ name = name
}

func Test_ReflectFromStructNonUniqueSections(t *testing.T) {
t.Run("reflect embedded structs into their own non unique sections", func(t *testing.T) {
type BaseSlot struct {
Id int `ini:",nonunique"`
}
type BigSlot struct {
*BaseSlot `ini:"big_slot,nonunique"`
Color string
}
type IniFile struct {
BigSlots []BigSlot `ini:"big_slot,nonunique"`
}

cfg := Empty(LoadOptions{AllowNonUniqueSections: true})
require.NoError(t, ReflectFrom(cfg, &IniFile{
BigSlots: []BigSlot{
{BaseSlot: &BaseSlot{Id: 3}, Color: "blue"},
{BaseSlot: &BaseSlot{Id: 4}, Color: "red"},
},
}))

var buf bytes.Buffer
_, err := cfg.WriteTo(&buf)
require.NoError(t, err)
assert.Equal(t, `[big_slot]
Id = 3
Color = blue

[big_slot]
Id = 4
Color = red
`, buf.String())
})

t.Run("reflect from struct with non unique sections", func(t *testing.T) {
nonUnique := &testNonUniqueSectionsStruct{
Interface: testInterface{
Expand Down