Skip to content

simplified Tool.LatestRelease() and some code makeup #1440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 10, 2021
Merged

simplified Tool.LatestRelease() and some code makeup #1440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cd2b0a
Simplified implementation of Tool.LatestRelease/GetLatestInstalled me…
cmaglie Sep 8, 2021
90b52b7
Some code make-up
cmaglie Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 42 additions & 28 deletions arduino/cores/packagemanager/package_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,34 +346,48 @@ func TestFindToolsRequiredFromPlatformRelease(t *testing.T) {

pm := packagemanager.NewPackageManager(fakePath, fakePath, fakePath, fakePath)
pack := pm.Packages.GetOrCreatePackage("arduino")
// some tool
tool := pack.GetOrCreateTool("some-tool")
toolRelease := tool.GetOrCreateRelease(semver.ParseRelaxed("4.2.0"))
// We set this to fake the tool is installed
toolRelease.InstallDir = fakePath
// some tool
tool = pack.GetOrCreateTool("some-tool")
toolRelease = tool.GetOrCreateRelease(semver.ParseRelaxed("5.6.7"))
// We set this to fake the tool is installed
toolRelease.InstallDir = fakePath
// some other tool
tool = pack.GetOrCreateTool("some-other-tool")
toolRelease = tool.GetOrCreateRelease(semver.ParseRelaxed("6.6.6"))
// We set this to fake the tool is installed
toolRelease.InstallDir = fakePath
// ble-discovery tool
tool = pack.GetOrCreateTool("ble-discovery")
toolRelease = tool.GetOrCreateRelease(semver.ParseRelaxed("1.0.0"))
// We set this to fake the tool is installed
toolRelease.InstallDir = fakePath
tool.GetOrCreateRelease(semver.ParseRelaxed("0.1.0"))

// serial-discovery tool
tool = pack.GetOrCreateTool("serial-discovery")
tool.GetOrCreateRelease(semver.ParseRelaxed("1.0.0"))
toolRelease = tool.GetOrCreateRelease(semver.ParseRelaxed("0.1.0"))
// We set this to fake the tool is installed
toolRelease.InstallDir = fakePath

{
// some tool
tool := pack.GetOrCreateTool("some-tool")
toolRelease := tool.GetOrCreateRelease(semver.ParseRelaxed("4.2.0"))
// We set this to fake the tool is installed
toolRelease.InstallDir = fakePath
}

{
// some tool
tool := pack.GetOrCreateTool("some-tool")
toolRelease := tool.GetOrCreateRelease(semver.ParseRelaxed("5.6.7"))
// We set this to fake the tool is installed
toolRelease.InstallDir = fakePath
}

{
// some other tool
tool := pack.GetOrCreateTool("some-other-tool")
toolRelease := tool.GetOrCreateRelease(semver.ParseRelaxed("6.6.6"))
// We set this to fake the tool is installed
toolRelease.InstallDir = fakePath
}

{
// ble-discovery tool
tool := pack.GetOrCreateTool("ble-discovery")
toolRelease := tool.GetOrCreateRelease(semver.ParseRelaxed("1.0.0"))
// We set this to fake the tool is installed
toolRelease.InstallDir = fakePath
tool.GetOrCreateRelease(semver.ParseRelaxed("0.1.0"))
}

{
// serial-discovery tool
tool := pack.GetOrCreateTool("serial-discovery")
tool.GetOrCreateRelease(semver.ParseRelaxed("1.0.0"))
toolRelease := tool.GetOrCreateRelease(semver.ParseRelaxed("0.1.0"))
// We set this to fake the tool is installed
toolRelease.InstallDir = fakePath
}

platform := pack.GetOrCreatePlatform("avr")
release := platform.GetOrCreateRelease(semver.MustParse("1.0.0"))
Expand Down
31 changes: 7 additions & 24 deletions arduino/cores/tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,8 @@ func (tool *Tool) FindReleaseWithRelaxedVersion(version *semver.RelaxedVersion)

// GetAllReleasesVersions returns all the version numbers in this Core Package.
func (tool *Tool) GetAllReleasesVersions() []*semver.RelaxedVersion {
releases := tool.Releases
versions := []*semver.RelaxedVersion{}
for _, release := range releases {
for _, release := range tool.Releases {
versions = append(versions, release.Version)
}

Expand All @@ -79,37 +78,21 @@ func (tool *Tool) GetAllReleasesVersions() []*semver.RelaxedVersion {

// LatestRelease obtains latest version of a core package.
func (tool *Tool) LatestRelease() *ToolRelease {
latest := tool.latestReleaseVersion()
if latest == nil {
return nil
}

return tool.FindReleaseWithRelaxedVersion(latest)
}

// latestReleaseVersion obtains latest version number.
func (tool *Tool) latestReleaseVersion() *semver.RelaxedVersion {
versions := tool.GetAllReleasesVersions()
if len(versions) == 0 {
return nil
}
max := versions[0]
for i := 1; i < len(versions); i++ {
if versions[i].GreaterThan(max) {
max = versions[i]
var latest *ToolRelease
for _, release := range tool.Releases {
if latest == nil || release.Version.GreaterThan(latest.Version) {
latest = release
}
}
return max
return latest
}

// GetLatestInstalled returns the latest installed ToolRelease for the Tool, or nil if no releases are installed.
func (tool *Tool) GetLatestInstalled() *ToolRelease {
var latest *ToolRelease
for _, release := range tool.Releases {
if release.IsInstalled() {
if latest == nil {
latest = release
} else if latest.Version.LessThan(release.Version) {
if latest == nil || latest.Version.LessThan(release.Version) {
latest = release
}
}
Expand Down