Cache board identification properties

Author: cmaglie

arduino/cores/board.go

@@ -24,9 +24,10 @@ import (
 
 // Board represents a board loaded from an installed platform
 type Board struct {
-	BoardID         string
-	Properties      *properties.Map  `json:"-"`
-	PlatformRelease *PlatformRelease `json:"-"`
+	BoardID                  string
+	Properties               *properties.Map  `json:"-"`
+	PlatformRelease          *PlatformRelease `json:"-"`
+	identificationProperties []*properties.Map
 }
 
 // HasUsbID returns true if the board match the usb vid and pid parameters
@@ -140,22 +141,18 @@ func (b *Board) GeneratePropertiesForConfiguration(config string) (*properties.M
 	return b.GetBuildProperties(fqbn.Configs)
 }
 
-// IsBoardMatchingIDProperties returns true if the board match the given
-// identification properties
-func (b *Board) IsBoardMatchingIDProperties(query *properties.Map) bool {
-	portIDPropsSet := b.Properties.SubTree("upload_port")
-	if portIDPropsSet.Size() == 0 {
-		return false
+// GetIdentificationProperties calculate and returns a list of properties sets
+// containing the properties required to identify the board. The returned sets
+// must not be changed by the caller.
+func (b *Board) GetIdentificationProperties() []*properties.Map {
+	if b.identificationProperties != nil {
+		return b.identificationProperties
 	}
+	b.identificationProperties = []*properties.Map{}
 
-	// check checks if the given set of properties p match the "query"
-	check := func(p *properties.Map) bool {
-		for k, v := range p.AsMap() {
-			if !strings.EqualFold(query.Get(k), v) {
-				return false
-			}
-		}
-		return true
+	portIDPropsSet := b.Properties.SubTree("upload_port")
+	if portIDPropsSet.Size() == 0 {
+		return b.identificationProperties
 	}
 
 	// First check the identification properties with sub index "upload_port.N.xxx"
@@ -166,9 +163,7 @@ func (b *Board) IsBoardMatchingIDProperties(query *properties.Map) bool {
 		idx++
 		if idProps.Size() > 0 {
 			haveIndexedProperties = true
-			if check(idProps) {
-				return true
-			}
+			b.identificationProperties = append(b.identificationProperties, idProps)
 		} else if idx > 1 {
 			// Always check sub-id 0 and 1 (https://github.com/arduino/arduino-cli/issues/456)
 			break
@@ -177,8 +172,30 @@ func (b *Board) IsBoardMatchingIDProperties(query *properties.Map) bool {
 
 	// if there are no subindexed then check the whole "upload_port.xxx"
 	if !haveIndexedProperties {
-		return check(portIDPropsSet)
+		b.identificationProperties = append(b.identificationProperties, portIDPropsSet)
 	}
 
+	return b.identificationProperties
+}
+
+// IsBoardMatchingIDProperties returns true if the board match the given
+// identification properties
+func (b *Board) IsBoardMatchingIDProperties(query *properties.Map) bool {
+	// check checks if the given set of properties p match the "query"
+	check := func(p *properties.Map) bool {
+		for k, v := range p.AsMap() {
+			if !strings.EqualFold(query.Get(k), v) {
+				return false
+			}
+		}
+		return true
+	}
+
+	// First check the identification properties with sub index "upload_port.N.xxx"
+	for _, idProps := range b.GetIdentificationProperties() {
+		if check(idProps) {
+			return true
+		}
+	}
 	return false
 }