Fix core list command not returning latest available version (arduino#1409)

silvanocerza · web-flow · commit 372b881fd0d9 · 2021-08-25T11:41:25.000+02:00
diff --git a/commands/core/list.go b/commands/core/list.go
@@ -16,6 +16,7 @@
 package core
 
 import (
+	"fmt"
 	"sort"
 	"strings"
 
@@ -58,14 +59,20 @@ func GetPlatforms(req *rpc.PlatformListRequest) ([]*rpc.Platform, error) {
 			}
 
 			if platformRelease != nil {
+				latest := platform.GetLatestRelease()
+				if latest == nil {
+					return nil, fmt.Errorf(tr("can't find latest release of core %s", platform))
+				}
+
 				if req.UpdatableOnly {
-					if latest := platform.GetLatestRelease(); latest == nil || latest == platformRelease {
+					if latest == platformRelease {
 						continue
 					}
 				}
 
 				rpcPlatform := commands.PlatformReleaseToRPC(platformRelease)
 				rpcPlatform.Installed = platformRelease.Version.String()
+				rpcPlatform.Latest = latest.Version.String()
 				res = append(res, rpcPlatform)
 			}
 		}
diff --git a/i18n/data/en.po b/i18n/data/en.po
@@ -2129,6 +2129,10 @@ msgstr "can't find dependencies for platform %[1]s: %[2]w"
 msgid "can't find latest release of %s"
 msgstr "can't find latest release of %s"
 
+#: commands/core/list.go:64
+msgid "can't find latest release of core %s"
+msgstr "can't find latest release of core %s"
+
 #: arduino/sketch/sketch.go:101
 msgid "can't find main Sketch file in %s"
 msgstr "can't find main Sketch file in %s"
@@ -2630,7 +2634,7 @@ msgstr "invalid hash '%[1]s': %[2]s"
 #: commands/compile/compile.go:93
 #: commands/core/download.go:36
 #: commands/core/install.go:35
-#: commands/core/list.go:38
+#: commands/core/list.go:39
 #: commands/core/search.go:40
 #: commands/core/uninstall.go:33
 #: commands/core/upgrade.go:40
@@ -3306,7 +3310,7 @@ msgstr "unable to create a folder to save the sketch files"
 msgid "unable to create the folder containing the item"
 msgstr "unable to create the folder containing the item"
 
-#: commands/core/list.go:33
+#: commands/core/list.go:34
 msgid "unable to find an instance with ID: %d"
 msgstr "unable to find an instance with ID: %d"
 
diff --git a/i18n/rice-box.go b/i18n/rice-box.go
diff --git a/test/test_core.py b/test/test_core.py
@@ -23,6 +23,7 @@
 import hashlib
 from git import Repo
 from pathlib import Path
+import semver
 
 
 def test_core_search(run_command, httpserver):
@@ -753,3 +754,21 @@ def test_core_with_missing_custom_board_options_is_loaded(run_command, data_dir)
         + "skipping loading of boards arduino-beta-dev:platform_with_missing_custom_board_options:nessuno: "
         + "malformed custom board options"
     ) in res.stderr
+
+
+def test_core_list_outdated_core(run_command):
+    assert run_command("update")
+
+    # Install an old core version
+    assert run_command("core install arduino:samd@1.8.6")
+
+    res = run_command("core list --format json")
+
+    data = json.loads(res.stdout)
+    assert len(data) == 1
+    samd_core = data[0]
+    assert samd_core["installed"] == "1.8.6"
+    installed_version = semver.parse_version_info(samd_core["installed"])
+    latest_version = semver.parse_version_info(samd_core["latest"])
+    # Installed version must be older than latest
+    assert installed_version.compare(latest_version) == -1

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`package core`
`17`	`17`
`18`	`18`	`import (`
	`19`	`+ "fmt"`
`19`	`20`	`"sort"`
`20`	`21`	`"strings"`
`21`	`22`
`@@ -58,14 +59,20 @@ func GetPlatforms(req rpc.PlatformListRequest) ([]rpc.Platform, error) {`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`if platformRelease != nil {`
	`62`	`+ latest := platform.GetLatestRelease()`
	`63`	`+ if latest == nil {`
	`64`	`+ return nil, fmt.Errorf(tr("can't find latest release of core %s", platform))`
	`65`	`+ }`
	`66`	`+`
`61`	`67`	`if req.UpdatableOnly {`
`62`		`- if latest := platform.GetLatestRelease(); latest == nil \|\| latest == platformRelease {`
	`68`	`+ if latest == platformRelease {`
`63`	`69`	`continue`
`64`	`70`	`}`
`65`	`71`	`}`
`66`	`72`
`67`	`73`	`rpcPlatform := commands.PlatformReleaseToRPC(platformRelease)`
`68`	`74`	`rpcPlatform.Installed = platformRelease.Version.String()`
	`75`	`+ rpcPlatform.Latest = latest.Version.String()`
`69`	`76`	`res = append(res, rpcPlatform)`
`70`	`77`	`}`
`71`	`78`	`}`