fix packages being added to the package manager even if they were not respecting the specification

Author: umbynos

arduino/cores/packagemanager/loader.go

@@ -144,6 +144,10 @@ func (pm *PackageManager) LoadHardwareFromDirectory(path *paths.Path) []*status.
 				statuses = append(statuses, errs...)
 			}
 		}
+		// If the Package does not contain Platforms or Tools we remove it since does not contain anything valuable
+		if len(targetPackage.Platforms) == 0 && len(targetPackage.Tools) == 0 {
+			delete(pm.Packages, packager)
+		}
 	}
 
 	return statuses
@@ -261,7 +265,6 @@ func (pm *PackageManager) loadPlatform(targetPackage *cores.Package, platformPat
 		// case: ARCHITECTURE/VERSION/boards.txt
 		// let's dive into VERSION directories
 
-		platform := targetPackage.GetOrCreatePlatform(architecture)
 		versionDirs, err := platformPath.ReadDir()
 		if err != nil {
 			return status.Newf(codes.FailedPrecondition, tr("reading dir %[1]s: %[2]s"), platformPath, err)
@@ -279,6 +282,7 @@ func (pm *PackageManager) loadPlatform(targetPackage *cores.Package, platformPat
 			if err != nil {
 				return status.Newf(codes.FailedPrecondition, tr("invalid version dir %[1]s: %[2]s"), versionDir, err)
 			}
+			platform := targetPackage.GetOrCreatePlatform(architecture)
 			release := platform.GetOrCreateRelease(version)
 			if err := pm.loadPlatformRelease(release, versionDir); err != nil {
 				return status.Newf(codes.FailedPrecondition, tr("loading platform release %[1]s: %[2]s"), release, err)

i18n/data/en.po

@@ -2474,7 +2474,7 @@ msgstr "can't find latest release of %s"
 msgid "can't find main Sketch file in %s"
 msgstr "can't find main Sketch file in %s"
 
-#: arduino/cores/packagemanager/loader.go:791
+#: arduino/cores/packagemanager/loader.go:795
 msgid "can't find pattern for discovery with id %s"
 msgstr "can't find pattern for discovery with id %s"
 
@@ -2557,7 +2557,7 @@ msgstr "computing hash: %s"
 msgid "could not find a valid build artifact"
 msgstr "could not find a valid build artifact"
 
-#: arduino/cores/packagemanager/loader.go:728
+#: arduino/cores/packagemanager/loader.go:732
 msgid "creating discovery: %s"
 msgstr "creating discovery: %s"
 
@@ -2598,11 +2598,11 @@ msgstr "directory doesn't exist: %s"
 msgid "discovery %[1]s process not started: %[2]w"
 msgstr "discovery %[1]s process not started: %[2]w"
 
-#: arduino/cores/packagemanager/loader.go:719
+#: arduino/cores/packagemanager/loader.go:723
 msgid "discovery not found: %s"
 msgstr "discovery not found: %s"
 
-#: arduino/cores/packagemanager/loader.go:723
+#: arduino/cores/packagemanager/loader.go:727
 msgid "discovery not installed: %s"
 msgstr "discovery not installed: %s"
 
@@ -2739,7 +2739,7 @@ msgstr "getting build properties for board %[1]s: %[2]s"
 msgid "getting discovery dependencies for platform %[1]s: %[2]s"
 msgstr "getting discovery dependencies for platform %[1]s: %[2]s"
 
-#: arduino/cores/packagemanager/loader.go:672
+#: arduino/cores/packagemanager/loader.go:676
 msgid "getting parent dir of %[1]s: %[2]s"
 msgstr "getting parent dir of %[1]s: %[2]s"
 
@@ -2856,7 +2856,7 @@ msgstr "invalid path writing inventory file: %[1]s error: %[2]w"
 msgid "invalid platform archive size: %s"
 msgstr "invalid platform archive size: %s"
 
-#: arduino/cores/packagemanager/loader.go:369
+#: arduino/cores/packagemanager/loader.go:373
 msgid "invalid pluggable monitor reference: %s"
 msgstr "invalid pluggable monitor reference: %s"
 
@@ -2876,7 +2876,7 @@ msgstr "invalid recipe '%[1]s': %[2]s"
 msgid "invalid value '%[1]s' for option '%[2]s'"
 msgstr "invalid value '%[1]s' for option '%[2]s'"
 
-#: arduino/cores/packagemanager/loader.go:280
+#: arduino/cores/packagemanager/loader.go:283
 msgid "invalid version dir %[1]s: %[2]s"
 msgstr "invalid version dir %[1]s: %[2]s"
 
@@ -2913,17 +2913,17 @@ msgstr "listing ports from discovery %[1]s: %[2]w"
 msgid "listing serial ports"
 msgstr "listing serial ports"
 
-#: arduino/cores/packagemanager/loader.go:307
-#: arduino/cores/packagemanager/loader.go:316
-#: arduino/cores/packagemanager/loader.go:321
+#: arduino/cores/packagemanager/loader.go:311
+#: arduino/cores/packagemanager/loader.go:320
+#: arduino/cores/packagemanager/loader.go:325
 msgid "loading %[1]s: %[2]s"
 msgstr "loading %[1]s: %[2]s"
 
-#: arduino/cores/packagemanager/loader.go:357
+#: arduino/cores/packagemanager/loader.go:361
 msgid "loading boards: %s"
 msgstr "loading boards: %s"
 
-#: arduino/cores/packagemanager/loader.go:627
+#: arduino/cores/packagemanager/loader.go:631
 msgid "loading bundled tools from %[1]s: %[2]s"
 msgstr "loading bundled tools from %[1]s: %[2]s"
 
@@ -2941,20 +2941,20 @@ msgstr "loading library from %[1]s: %[2]s"
 msgid "loading library.properties: %s"
 msgstr "loading library.properties: %s"
 
-#: arduino/cores/packagemanager/loader.go:256
-#: arduino/cores/packagemanager/loader.go:284
+#: arduino/cores/packagemanager/loader.go:260
+#: arduino/cores/packagemanager/loader.go:288
 msgid "loading platform release %[1]s: %[2]s"
 msgstr "loading platform release %[1]s: %[2]s"
 
-#: arduino/cores/packagemanager/loader.go:207
+#: arduino/cores/packagemanager/loader.go:211
 msgid "loading platform.txt: %v"
 msgstr "loading platform.txt: %v"
 
-#: arduino/cores/packagemanager/loader.go:594
+#: arduino/cores/packagemanager/loader.go:598
 msgid "loading tool release in %[1]s: %[2]s"
 msgstr "loading tool release in %[1]s: %[2]s"
 
-#: arduino/cores/packagemanager/loader.go:200
+#: arduino/cores/packagemanager/loader.go:204
 msgid "looking for boards.txt in %[1]s: %[2]s"
 msgstr "looking for boards.txt in %[1]s: %[2]s"
 
@@ -3032,7 +3032,7 @@ msgstr "no versions available for the current OS"
 msgid "opening archive file: %s"
 msgstr "opening archive file: %s"
 
-#: arduino/cores/packagemanager/loader.go:273
+#: arduino/cores/packagemanager/loader.go:276
 msgid "opening boards.txt: %s"
 msgstr "opening boards.txt: %s"
 
@@ -3063,7 +3063,7 @@ msgstr "package '%s' not found"
 msgid "package not found"
 msgstr "package not found"
 
-#: arduino/cores/packagemanager/loader.go:227
+#: arduino/cores/packagemanager/loader.go:231
 msgid "parsing IDE bundled index: %s"
 msgstr "parsing IDE bundled index: %s"
 
@@ -3076,7 +3076,7 @@ msgstr "parsing fqbn: %s"
 msgid "parsing library_index.json: %s"
 msgstr "parsing library_index.json: %s"
 
-#: arduino/cores/packagemanager/loader.go:189
+#: arduino/cores/packagemanager/loader.go:193
 msgid "path is not a platform directory: %s"
 msgstr "path is not a platform directory: %s"
 
@@ -3094,7 +3094,7 @@ msgstr "platform %s is not installed"
 
 #: arduino/cores/packagemanager/install_uninstall.go:65
 #: arduino/cores/packagemanager/install_uninstall.go:108
-#: arduino/cores/packagemanager/loader.go:456
+#: arduino/cores/packagemanager/loader.go:460
 #: commands/compile/compile.go:127
 msgid "platform not installed"
 msgstr "platform not installed"
@@ -3131,17 +3131,17 @@ msgstr "quitting discovery %[1]s: %[2]w"
 msgid "reading %[1]s directory: %[2]s"
 msgstr "reading %[1]s directory: %[2]s"
 
-#: arduino/cores/packagemanager/loader.go:677
+#: arduino/cores/packagemanager/loader.go:681
 msgid "reading %[1]s: %[2]s"
 msgstr "reading %[1]s: %[2]s"
 
-#: arduino/cores/packagemanager/loader.go:267
+#: arduino/cores/packagemanager/loader.go:270
 #: arduino/libraries/librariesmanager/librariesmanager.go:196
 msgid "reading dir %[1]s: %[2]s"
 msgstr "reading dir %[1]s: %[2]s"
 
-#: arduino/cores/packagemanager/loader.go:162
-#: arduino/cores/packagemanager/loader.go:585
+#: arduino/cores/packagemanager/loader.go:166
+#: arduino/cores/packagemanager/loader.go:589
 msgid "reading directory %[1]s: %[2]s"
 msgstr "reading directory %[1]s: %[2]s"
 
@@ -3232,7 +3232,7 @@ msgstr "retrieving Arduino public keys: %s"
 msgid "scanning examples: %s"
 msgstr "scanning examples: %s"
 
-#: arduino/cores/packagemanager/loader.go:663
+#: arduino/cores/packagemanager/loader.go:667
 msgid "searching for builtin_tools_versions.txt in %[1]s: %[2]s"
 msgstr "searching for builtin_tools_versions.txt in %[1]s: %[2]s"
 
@@ -3253,7 +3253,7 @@ msgstr "sketch path is not valid"
 msgid "sketchPath"
 msgstr "sketchPath"
 
-#: arduino/cores/packagemanager/loader.go:519
+#: arduino/cores/packagemanager/loader.go:523
 msgid "skipping loading of boards %s: malformed custom board options"
 msgstr "skipping loading of boards %s: malformed custom board options"