Renamed some fields in cores package and other small makeup

No behavioural changes, inlined two methods and removed one file.

Author: cmaglie

commands/core/install.go

@@ -77,13 +77,14 @@ func runInstallCommand(cmd *cobra.Command, args []string) {
 		Cores: failOutputs,
 		Tools: make([]output.ProcessResult, 0, 10),
 	}
+
 	downloads := make([]releases.DownloadItem, len(toolsToDownload))
 	for i := range toolsToDownload {
 		downloads[i] = toolsToDownload[i].DownloadItem
 	}
-
 	logrus.Info("Downloading tool dependencies of all cores requested")
 	releases.ParallelDownload(downloads, false, "Downloaded", &outputResults.Tools, "tool")
+
 	downloads = make([]releases.DownloadItem, len(coresToDownload))
 	for i := range coresToDownload {
 		downloads[i] = coresToDownload[i].DownloadItem

cores/cores.go

@@ -40,16 +40,16 @@ import (
 	"github.com/blang/semver"
 )
 
-// Core represents a core package.
-type Core struct {
-	Name         string              // The name of the Core Package.
-	Architecture string              // The name of the architecture of this package.
-	Category     string              // The category which this core package belongs to.
-	Releases     map[string]*Release // The Releases of this core package, labeled by version.
+// Platform represents a platform package.
+type Platform struct {
+	Name         string                      // The name of the Core Package.
+	Architecture string                      // The name of the architecture of this package.
+	Category     string                      // The category which this core package belongs to.
+	Releases     map[string]*PlatformRelease // The Releases of this core package, labeled by version.
 }
 
-// Release represents a release of a core package.
-type Release struct {
+// PlatformRelease represents a release of a core package.
+type PlatformRelease struct {
 	Version         string
 	ArchiveFileName string
 	Checksum        string
@@ -71,17 +71,17 @@ type ToolDependency struct {
 
 // GetVersion returns the specified release corresponding the provided version,
 // or nil if not found.
-func (core *Core) GetVersion(version string) *Release {
+func (platform *Platform) GetVersion(version string) *PlatformRelease {
 	if version == "latest" {
-		return core.GetVersion(core.latestVersion())
+		return platform.GetVersion(platform.latestVersion())
 	}
-	return core.Releases[version]
+	return platform.Releases[version]
 }
 
 // Versions returns all the version numbers in this Core Package.
-func (core *Core) Versions() semver.Versions {
-	versions := make(semver.Versions, 0, len(core.Releases))
-	for _, release := range core.Releases {
+func (platform *Platform) Versions() semver.Versions {
+	versions := make(semver.Versions, 0, len(platform.Releases))
+	for _, release := range platform.Releases {
 		temp, err := semver.Make(release.Version)
 		if err == nil {
 			versions = append(versions, temp)
@@ -94,8 +94,8 @@ func (core *Core) Versions() semver.Versions {
 // latestVersion obtains latest version number.
 //
 // It uses lexicographics to compare version strings.
-func (core *Core) latestVersion() string {
-	versions := core.Versions()
+func (platform *Platform) latestVersion() string {
+	versions := platform.Versions()
 	if len(versions) > 0 {
 		max := versions[0]
 		for i := 1; i < len(versions); i++ {
@@ -108,20 +108,20 @@ func (core *Core) latestVersion() string {
 	return ""
 }
 
-func (core *Core) String() string {
-	res := fmt.Sprintln("Name        :", core.Name) +
-		fmt.Sprintln("Architecture:", core.Architecture) +
-		fmt.Sprintln("Category    :", core.Category)
-	if core.Releases != nil && len(core.Releases) > 0 {
+func (platform *Platform) String() string {
+	res := fmt.Sprintln("Name        :", platform.Name) +
+		fmt.Sprintln("Architecture:", platform.Architecture) +
+		fmt.Sprintln("Category    :", platform.Category)
+	if platform.Releases != nil && len(platform.Releases) > 0 {
 		res += "Releases:\n"
-		for _, release := range core.Releases {
+		for _, release := range platform.Releases {
 			res += fmt.Sprintln(release)
 		}
 	}
 	return res
 }
 
-func (release *Release) String() string {
+func (release *PlatformRelease) String() string {
 	return fmt.Sprintln("  Version           : ", release.Version) +
 		fmt.Sprintln("  Boards            :") +
 		fmt.Sprintln(strings.Join(release.Boards, ", ")) +
@@ -132,7 +132,7 @@ func (release *Release) String() string {
 }
 
 // OpenLocalArchiveForDownload Creates an empty file if not found.
-func (release Release) OpenLocalArchiveForDownload() (*os.File, error) {
+func (release PlatformRelease) OpenLocalArchiveForDownload() (*os.File, error) {
 	path, err := releases.ArchivePath(release)
 	if err != nil {
 		return nil, err
@@ -149,31 +149,31 @@ func (release Release) OpenLocalArchiveForDownload() (*os.File, error) {
 // Implementation of Release interface
 
 // ExpectedChecksum returns the expected checksum for this release.
-func (release Release) ExpectedChecksum() string {
+func (release PlatformRelease) ExpectedChecksum() string {
 	return release.Checksum
 }
 
 // ArchiveName returns the archive file name (not the path)
-func (release Release) ArchiveName() string {
+func (release PlatformRelease) ArchiveName() string {
 	return release.ArchiveFileName
 }
 
 // ArchiveSize returns the archive size.
-func (release Release) ArchiveSize() int64 {
+func (release PlatformRelease) ArchiveSize() int64 {
 	return release.Size
 }
 
 // ArchiveURL returns the archive URL.
-func (release Release) ArchiveURL() string {
+func (release PlatformRelease) ArchiveURL() string {
 	return release.URL
 }
 
 // GetDownloadCacheFolder returns the path of the staging folders for this release.
-func (release Release) GetDownloadCacheFolder() (string, error) {
+func (release PlatformRelease) GetDownloadCacheFolder() (string, error) {
 	return configs.DownloadCacheFolder("packages").Get()
 }
 
 // VersionName represents the version of the release.
-func (release Release) VersionName() string {
+func (release PlatformRelease) VersionName() string {
 	return release.Version
 }

cores/index.go

@@ -46,17 +46,17 @@ type Index struct {
 
 // indexPackage represents a single entry from package_index.json file.
 type indexPackage struct {
-	Name       string              `json:"name,required"`
-	Maintainer string              `json:"maintainer,required"`
-	WebsiteURL string              `json:"websiteUrl"`
-	Email      string              `json:"email"`
-	Platforms  []*indexCoreRelease `json:"platforms,required"`
-	Tools      []*indexToolRelease `json:"tools,required"`
-	Help       indexHelpRelease    `json:"help,omitempty"`
+	Name       string                  `json:"name,required"`
+	Maintainer string                  `json:"maintainer,required"`
+	WebsiteURL string                  `json:"websiteUrl"`
+	Email      string                  `json:"email"`
+	Platforms  []*indexPlatformRelease `json:"platforms,required"`
+	Tools      []*indexToolRelease     `json:"tools,required"`
+	Help       indexHelp               `json:"help,omitempty"`
 }
 
-// indexCoreRelease represents a single Core Platform from package_index.json file.
-type indexCoreRelease struct {
+// indexPlatformRelease represents a single Core Platform from package_index.json file.
+type indexPlatformRelease struct {
 	Name             string                `json:"name,required"`
 	Architecture     string                `json:"architecture"`
 	Version          string                `json:"version,required"`
@@ -65,8 +65,8 @@ type indexCoreRelease struct {
 	ArchiveFileName  string                `json:"archiveFileName,required"`
 	Checksum         string                `json:"checksum,required"`
 	Size             int64                 `json:"size,required,string"`
-	Boards           []indexBoardRelease   `json:"boards"`
-	Help             indexHelpRelease      `json:"help,omitempty"`
+	BoardsNames      []indexBoardName      `json:"boards"`
+	Help             indexHelp             `json:"help,omitempty"`
 	ToolDependencies []indexToolDependency `json:"toolsDependencies, required"`
 }
 
@@ -79,60 +79,72 @@ type indexToolDependency struct {
 
 // indexToolRelease represents a single Tool from package_index.json file.
 type indexToolRelease struct {
-	Name    string                `json:"name,required"`
-	Version string                `json:"version,required"`
-	Systems []indexFlavourRelease `json:"systems,required"`
+	Name    string                    `json:"name,required"`
+	Version string                    `json:"version,required"`
+	Systems []indexToolReleaseFlavour `json:"systems,required"`
 }
 
-//indexFlavourRelease represents a single flavour in the package_index.json file.
-type indexFlavourRelease struct {
+// indexToolReleaseFlavour represents a single tool flavour in the package_index.json file.
+type indexToolReleaseFlavour struct {
 	OS              string `json:"host,required"`
 	URL             string `json:"url,required"`
 	ArchiveFileName string `json:"archiveFileName,required"`
 	Size            int64  `json:"size,required,string"`
 	Checksum        string `json:"checksum,required"`
 }
 
-// indexBoardRelease represents a single Board as written in package_index.json file.
-type indexBoardRelease struct {
+// indexBoardName represents a single Board as written in package_index.json file.
+type indexBoardName struct {
 	Name string
 }
 
-type indexHelpRelease struct {
+type indexHelp struct {
 	Online string `json:"online,omitempty"`
 }
 
-func (packag indexPackage) extractPackage() (pm *Package) {
-	pm = &Package{
-		Name:       packag.Name,
-		Maintainer: packag.Maintainer,
-		WebsiteURL: packag.WebsiteURL,
-		Email:      packag.Email,
-		Cores:      make(map[string]*Core, len(packag.Platforms)),
-		Tools:      make(map[string]*Tool, len(packag.Tools)),
+func (pack indexPackage) extractPackage() *Package {
+	p := &Package{
+		Name:       pack.Name,
+		Maintainer: pack.Maintainer,
+		WebsiteURL: pack.WebsiteURL,
+		Email:      pack.Email,
+		Plaftorms:  map[string]*Platform{},
+		Tools:      map[string]*Tool{},
 	}
 
-	for _, tool := range packag.Tools {
-		pm.addTool(tool)
+	for _, tool := range pack.Tools {
+		name := tool.Name
+		if p.Tools[name] == nil {
+			p.Tools[name] = tool.extractTool()
+		} else {
+			p.Tools[name].Releases[tool.Version] = tool.extractRelease()
+		}
 	}
-	for _, core := range packag.Platforms {
-		pm.addCore(core)
+
+	for _, platform := range pack.Platforms {
+		name := platform.Architecture
+		if p.Plaftorms[name] == nil {
+			p.Plaftorms[name] = platform.extractPlatform()
+		} else {
+			release := platform.extractRelease()
+			p.Plaftorms[name].Releases[release.Version] = release
+		}
 	}
 
-	return
+	return p
 }
 
-func (release indexCoreRelease) extractCore() *Core {
-	return &Core{
+func (release indexPlatformRelease) extractPlatform() *Platform {
+	return &Platform{
 		Name:         release.Name,
 		Architecture: release.Architecture,
 		Category:     release.Category,
-		Releases:     map[string]*Release{release.Version: release.extractRelease()},
+		Releases:     map[string]*PlatformRelease{release.Version: release.extractRelease()},
 	}
 }
 
-func (release indexCoreRelease) extractRelease() *Release {
-	return &Release{
+func (release indexPlatformRelease) extractRelease() *PlatformRelease {
+	return &PlatformRelease{
 		Version:         release.Version,
 		ArchiveFileName: release.ArchiveFileName,
 		Checksum:        release.Checksum,
@@ -143,7 +155,7 @@ func (release indexCoreRelease) extractRelease() *Release {
 	}
 }
 
-func (release indexCoreRelease) extractDeps() ToolDependencies {
+func (release indexPlatformRelease) extractDeps() ToolDependencies {
 	ret := make(ToolDependencies, len(release.ToolDependencies))
 	for i, dep := range release.ToolDependencies {
 		ret[i] = &ToolDependency{
@@ -155,21 +167,21 @@ func (release indexCoreRelease) extractDeps() ToolDependencies {
 	return ret
 }
 
-func (release indexCoreRelease) extractBoards() []string {
-	boards := make([]string, len(release.Boards))
-	for i, board := range release.Boards {
+func (release indexPlatformRelease) extractBoards() []string {
+	boards := make([]string, len(release.BoardsNames))
+	for i, board := range release.BoardsNames {
 		boards[i] = board.Name
 	}
 	return boards
 }
 
 // extractTool extracts a Tool object from an indexToolRelease entry.
 func (itr indexToolRelease) extractTool() *Tool {
-	releases := make(map[string]*ToolRelease, len(itr.Systems))
-	releases[itr.Version] = itr.extractRelease()
 	return &Tool{
-		Name:     itr.Name,
-		Releases: releases,
+		Name: itr.Name,
+		Releases: map[string]*ToolRelease{
+			itr.Version: itr.extractRelease(),
+		},
 	}
 }