Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: fix vehicle sort order (#9705)

Browse source
This commit is contained in:
andig 2023-09-03 21:10:47 +02:00 • committed by GitHub
parent 5dd4d9e6e2
commit ae10caaf51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

29
cmd/setup.go
View file

@ -277,8 +277,12 @@ func vehicleInstance(cc config.Named) (api.Vehicle, error) {
}
func configureVehicles(static []config.Named) error {
var mu sync.Mutex
g, _ := errgroup.WithContext(context.Background())
// stable-sort vehicles by name
devs1 := make([]config.Device[api.Vehicle], 0, len(static))
for i, cc := range static {
if cc.Name == "" {
return fmt.Errorf("cannot create vehicle %d: missing name", i+1)
@ -291,7 +295,11 @@ func configureVehicles(static []config.Named) error {
return fmt.Errorf("cannot create vehicle '%s': %w", cc.Name, err)
}
return config.Vehicles().Add(config.NewStaticDevice(cc, instance))
mu.Lock()
defer mu.Unlock()
devs1 = append(devs1, config.NewStaticDevice(cc, instance))
return nil
})
}
@ -302,8 +310,7 @@ func configureVehicles(static []config.Named) error {
}
// stable-sort vehicles by id
var mu sync.Mutex
devs := make([]config.ConfigurableDevice[api.Vehicle], 0, len(configurable))
devs2 := make([]config.ConfigurableDevice[api.Vehicle], 0, len(configurable))
for _, conf := range configurable {
conf := conf
@ -316,7 +323,7 @@ func configureVehicles(static []config.Named) error {
mu.Lock()
defer mu.Unlock()
devs = append(devs, config.NewConfigurableDevice(conf, instance))
devs2 = append(devs2, config.NewConfigurableDevice(conf, instance))
return nil
})
@ -326,11 +333,21 @@ func configureVehicles(static []config.Named) error {
return err
}
slices.SortFunc(devs, func(i, j config.ConfigurableDevice[api.Vehicle]) int {
slices.SortFunc(devs1, func(i, j config.Device[api.Vehicle]) int {
return cmp.Compare(strings.ToLower(i.Config().Name), strings.ToLower(j.Config().Name))
})
for _, dev := range devs1 {
if err := config.Vehicles().Add(dev); err != nil {
return err
}
}
slices.SortFunc(devs2, func(i, j config.ConfigurableDevice[api.Vehicle]) int {
return cmp.Compare(i.ID(), j.ID())
})
for _, dev := range devs {
for _, dev := range devs2 {
if err := config.Vehicles().Add(dev); err != nil {
return err
}