Use new methods in go-properties-orderedmap to calculate subsets

Author: cmaglie

arduino/cores/board.go

@@ -145,36 +145,9 @@ func (b *Board) GeneratePropertiesForConfiguration(config string) (*properties.M
 // 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
+	if b.identificationProperties == nil {
+		b.identificationProperties = b.Properties.ExtractSubIndexSets("upload_port")
 	}
-	b.identificationProperties = []*properties.Map{}
-
-	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"
-	idx := 0
-	haveIndexedProperties := false
-	for {
-		idProps := portIDPropsSet.SubTree(fmt.Sprintf("%d", idx))
-		idx++
-		if idProps.Size() > 0 {
-			haveIndexedProperties = 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
-		}
-	}
-
-	// if there are no subindexed then check the whole "upload_port.xxx"
-	if !haveIndexedProperties {
-		b.identificationProperties = append(b.identificationProperties, portIDPropsSet)
-	}
-
 	return b.identificationProperties
 }
 

go.mod

@@ -5,7 +5,7 @@ go 1.14
 require (
 	github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c
 	github.com/arduino/go-paths-helper v1.6.0
-	github.com/arduino/go-properties-orderedmap v1.3.0
+	github.com/arduino/go-properties-orderedmap v1.5.0
 	github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b
 	github.com/arduino/go-win32-utils v0.0.0-20180330194947-ed041402e83b
 	github.com/cmaglie/go.rice v1.0.3 // This one must be kept until https://github.com/GeertJohan/go.rice/pull/159 is merged

go.sum

@@ -22,6 +22,8 @@ github.com/arduino/go-paths-helper v1.6.0 h1:S7/d7DqB9XlnvF9KrgSiGmo2oWKmYW6O/DT
 github.com/arduino/go-paths-helper v1.6.0/go.mod h1:V82BWgAAp4IbmlybxQdk9Bpkz8M4Qyx+RAFKaG9NuvU=
 github.com/arduino/go-properties-orderedmap v1.3.0 h1:4No/vQopB36e7WUIk6H6TxiSEJPiMrVOCZylYmua39o=
 github.com/arduino/go-properties-orderedmap v1.3.0/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk=
+github.com/arduino/go-properties-orderedmap v1.5.0 h1:istmr13qQN3nneuU3lsqlMvI6jqB3u8QUfVU1tX/t/8=
+github.com/arduino/go-properties-orderedmap v1.5.0/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk=
 github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b h1:9hDi4F2st6dbLC3y4i02zFT5quS4X6iioWifGlVwfy4=
 github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b/go.mod h1:uwGy5PpN4lqW97FiLnbcx+xx8jly5YuPMJWfVwwjJiQ=
 github.com/arduino/go-win32-utils v0.0.0-20180330194947-ed041402e83b h1:3PjgYG5gVPA7cipp7vIR2lF96KkEJIFBJ+ANnuv6J20=