Fixed regexp for loader detection and do not add incompatible loaders to the output

Author: cmaglie

utils/utils.go

@@ -40,10 +40,10 @@ func GetCompatibleWith(name string) map[string][]firmware {
 
 	knownBoards := make(map[string]combo)
 	knownBoards["mkr1000"] = combo{match: "(WINC1500)*(3a0)", loader: "WINC1500/Firmware*"}
-	knownBoards["mkrwifi1010"] = combo{match: "(NINA)", loader: "NINA/Firmware*(mkrwifi)*", avoid: "uno"}
-	knownBoards["nano_33_iot"] = combo{match: "(NINA)", loader: "NINA/Firmware*(mkrwifi)*", avoid: "uno"}
-	knownBoards["mkrvidor4000"] = combo{match: "(NINA)", loader: "NINA/Firmware*(mkrvidor)*", avoid: "uno"}
-	knownBoards["uno2018"] = combo{match: "(NINA)", loader: "NINA/Firmware*(unowifi)*", prefer: "uno", avoid: "mkr"}
+	knownBoards["mkrwifi1010"] = combo{match: "(NINA)", loader: "NINA/Firmware.*mkrwifi1010.*", avoid: "uno"}
+	knownBoards["nano_33_iot"] = combo{match: "(NINA)", loader: "NINA/Firmware.*nano_33_iot.*", avoid: "uno"}
+	knownBoards["mkrvidor4000"] = combo{match: "(NINA)", loader: "NINA/Firmware.*mkrvidor.*", avoid: "uno"}
+	knownBoards["uno2018"] = combo{match: "(NINA)", loader: "NINA/Firmware.*unowifi.*", prefer: "uno", avoid: "mkr"}
 	knownBoards["mkrnb1500"] = combo{match: "SARA", loader: "SARA/SerialSARAPassthrough*"}
 
 	listAll := false
@@ -74,6 +74,9 @@ func GetCompatibleWith(name string) map[string][]firmware {
 		lowerPath, _ := filepath.Rel(root, path)
 		lowerPath = strings.ToLower(lowerPath)
 		_, alreadyPopulated := files[folder]
+		if strings.HasPrefix(f.Name, "firmwares") && !f.IsLoader {
+			return nil
+		}
 		if listAll && !strings.HasPrefix(f.Name, "firmwares") {
 			files[folder] = append(files[folder], f)
 		}