commands: push always on top the arduino vendor

Author: alessio-perugini

commands/service_board_identify.go

@@ -23,6 +23,7 @@ import (
 	"io"
 	"net/http"
 	"regexp"
+	"slices"
 	"sort"
 	"strings"
 	"time"
@@ -216,5 +217,14 @@ func apiByVidPid(ctx context.Context, vid, pid string, settings *configuration.S
 		}
 		response[i] = &rpc.BoardListItem{Name: v.Name, Fqbn: v.FQBN}
 	}
+
+	// In case multiple platform matches the same vid-pid we put on top
+	// the arduino ones
+	slices.SortFunc(response, func(a, b *rpc.BoardListItem) int {
+		if strings.HasPrefix(a.Fqbn, "arduino") {
+			return -1
+		}
+		return 0
+	})
 	return response, nil
 }

commands/service_board_identify_test.go

@@ -63,6 +63,41 @@ func TestGetByVidPid(t *testing.T) {
 	require.NotNil(t, err)
 }
 
+func TestGetByVidPidPutArduinoOnTop(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		fmt.Fprintln(w, `
+{
+  "items": [
+    {
+      "fqbn": "esp32:esp32:nano_nora",
+      "vendor": "esp32",
+      "architecture": "esp32",
+      "board_id": "nano_nora",
+      "name": "Arduino Nano ESP32"
+    },
+    {
+      "fqbn": "arduino:esp32:nano_nora",
+      "vendor": "arduino",
+      "architecture": "esp32",
+      "board_id": "nano_nora",
+      "name": "Arduino Nano ESP32"
+    }
+  ]
+}
+		`)
+	}))
+	defer ts.Close()
+
+	vidPidURL = ts.URL
+	settings := configuration.NewSettings()
+	res, err := apiByVidPid(context.Background(), "0x2341", "0x0070", settings)
+	require.Nil(t, err)
+	require.Len(t, res, 2)
+	require.Equal(t, "Arduino Nano ESP32", res[0].GetName())
+	require.Equal(t, "arduino:esp32:nano_nora", res[0].GetFqbn())
+	require.Equal(t, "esp32:esp32:nano_nora", res[1].GetFqbn())
+}
+
 func TestGetByVidPidNotFound(t *testing.T) {
 	settings := configuration.NewSettings()