From ae10caaf5152f30fb7e3cfd7bf177b29d247272e Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Sun, 3 Sep 2023 21:10:47 +0200
Subject: [PATCH] chore: fix vehicle sort order (#9705)

---
 cmd/setup.go | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/cmd/setup.go b/cmd/setup.go
index 6e8bb3e10..c32772ab6 100644
--- a/cmd/setup.go
+++ b/cmd/setup.go
@@ -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
 		}