Added programmers extraction in arduino/cores module

Author: cmaglie

arduino/cores/cores.go

@@ -40,14 +40,14 @@ type PlatformRelease struct {
 	Resource       *resources.DownloadResource
 	Version        *semver.Version
 	BoardsManifest []*BoardManifest
-	Dependencies   ToolDependencies           // The Dependency entries to load tools.
-	Platform       *Platform                  `json:"-"`
-	Properties     *properties.Map            `json:"-"`
-	Boards         map[string]*Board          `json:"-"`
-	Programmers    map[string]*properties.Map `json:"-"`
-	Menus          *properties.Map            `json:"-"`
-	InstallDir     *paths.Path                `json:"-"`
-	IsIDEBundled   bool                       `json:"-"`
+	Dependencies   ToolDependencies       // The Dependency entries to load tools.
+	Platform       *Platform              `json:"-"`
+	Properties     *properties.Map        `json:"-"`
+	Boards         map[string]*Board      `json:"-"`
+	Programmers    map[string]*Programmer `json:"-"`
+	Menus          *properties.Map        `json:"-"`
+	InstallDir     *paths.Path            `json:"-"`
+	IsIDEBundled   bool                   `json:"-"`
 }
 
 // BoardManifest contains information about a board. These metadata are usually
@@ -117,7 +117,7 @@ func (platform *Platform) GetOrCreateRelease(version *semver.Version) (*Platform
 		Version:     version,
 		Boards:      map[string]*Board{},
 		Properties:  properties.NewMap(),
-		Programmers: map[string]*properties.Map{},
+		Programmers: map[string]*Programmer{},
 		Platform:    platform,
 	}
 	platform.Releases[tag] = release

arduino/cores/packagemanager/loader.go

@@ -284,10 +284,10 @@ func (pm *PackageManager) loadPlatformRelease(platform *cores.PlatformRelease, p
 
 	// Create programmers properties
 	if programmersProperties, err := properties.SafeLoad(programmersTxtPath.String()); err == nil {
-		platform.Programmers = properties.MergeMapsOfProperties(
-			map[string]*properties.Map{},
-			platform.Programmers, // TODO: Very weird, why not an empty one?
-			programmersProperties.FirstLevelOf())
+		for programmerID, programmerProperties := range programmersProperties.FirstLevelOf() {
+			platform.Programmers[programmerID] = pm.loadProgrammer(programmerProperties)
+			platform.Programmers[programmerID].PlatformRelease = platform
+		}
 	} else {
 		return err
 	}
@@ -299,6 +299,13 @@ func (pm *PackageManager) loadPlatformRelease(platform *cores.PlatformRelease, p
 	return nil
 }
 
+func (pm *PackageManager) loadProgrammer(programmerProperties *properties.Map) *cores.Programmer {
+	return &cores.Programmer{
+		Name:       programmerProperties.Get("name"),
+		Properties: programmerProperties,
+	}
+}
+
 func (pm *PackageManager) loadBoards(platform *cores.PlatformRelease) error {
 	if platform.InstallDir == nil {
 		return fmt.Errorf("platform not installed")

arduino/cores/programmers.go

@@ -0,0 +1,25 @@
+// This file is part of arduino-cli.
+//
+// Copyright 2020 ARDUINO SA (http://www.arduino.cc/)
+//
+// This software is released under the GNU General Public License version 3,
+// which covers the main part of arduino-cli.
+// The terms of this license can be found at:
+// https://www.gnu.org/licenses/gpl-3.0.en.html
+//
+// You can be released from the requirements of the above licenses by purchasing
+// a commercial license. Buying such a license is mandatory if you want to
+// modify or otherwise use the software for commercial activities involving the
+// Arduino software without disclosing the source code of your own applications.
+// To purchase a commercial license, send an email to license@arduino.cc.
+
+package cores
+
+import "github.com/arduino/go-properties-orderedmap"
+
+// Programmer represents an external programmer
+type Programmer struct {
+	Name            string
+	Properties      *properties.Map
+	PlatformRelease *PlatformRelease
+}