Explorer and Builder should not extend PackageManager

Previuosly the methods PackageManager.NewBuilder and PackageManager.NewExplorer were available also on Builder and Explorer. Now Builder and Explorer does not inherith these methods anymore, avoiding trivial errors like the one fixed in this commit in the builder_utils package.
arduino · cmaglie · Aug 26, 2022 · Aug 5, 2022 · Aug 22, 2022 · Aug 3, 2022
commit 46eeee2dff339dd1021b4dcb6a8ac3b5734c156e
diff --git a/arduino/cores/packagemanager/package_manager.go b/arduino/cores/packagemanager/package_manager.go
@@ -56,33 +56,27 @@ type PackageManager struct {
 // Builder is used to create a new PackageManager. The builder
 // has methods to load patforms and tools to actually build the PackageManager.
 // Once the PackageManager is built, it cannot be changed anymore.
-type Builder struct {
-	*PackageManager
-}
+type Builder PackageManager
 
 // Explorer is used to query the PackageManager. When used it holds
 // a read-only lock on the PackageManager that must be released when the
 // job is completed.
-type Explorer struct {
-	*PackageManager
-}
+type Explorer PackageManager
 
 var tr = i18n.Tr
 
 // NewBuilder returns a new Builder
 func NewBuilder(indexDir, packagesDir, downloadDir, tempDir *paths.Path, userAgent string) *Builder {
 	return &Builder{
-		PackageManager: &PackageManager{
-			log:                            logrus.StandardLogger(),
-			packages:                       cores.NewPackages(),
-			IndexDir:                       indexDir,
-			PackagesDir:                    packagesDir,
-			DownloadDir:                    downloadDir,
-			tempDir:                        tempDir,
-			packagesCustomGlobalProperties: properties.NewMap(),
-			discoveryManager:               discoverymanager.New(),
-			userAgent:                      userAgent,
-		},
+		log:                            logrus.StandardLogger(),
+		packages:                       cores.NewPackages(),
+		IndexDir:                       indexDir,
+		PackagesDir:                    packagesDir,
+		DownloadDir:                    downloadDir,
+		tempDir:                        tempDir,
+		packagesCustomGlobalProperties: properties.NewMap(),
+		discoveryManager:               discoverymanager.New(),
+		userAgent:                      userAgent,
 	}
 }
 
@@ -128,7 +122,18 @@ func (pm *PackageManager) NewBuilder() (builder *Builder, commit func()) {
 // to correctly dispose it.
 func (pm *PackageManager) NewExplorer() (explorer *Explorer, release func()) {
 	pm.packagesLock.RLock()
-	return &Explorer{pm}, pm.packagesLock.RUnlock
+	return &Explorer{
+		log:                            pm.log,
+		packages:                       pm.packages,
+		IndexDir:                       pm.IndexDir,
+		PackagesDir:                    pm.PackagesDir,
+		DownloadDir:                    pm.DownloadDir,
+		tempDir:                        pm.tempDir,
+		packagesCustomGlobalProperties: pm.packagesCustomGlobalProperties,
+		profile:                        pm.profile,
+		discoveryManager:               pm.discoveryManager,
+		userAgent:                      pm.userAgent,
+	}, pm.packagesLock.RUnlock
 }
 
 // GetProfile returns the active profile for this package manager, or nil if no profile is selected.

diff --git a/legacy/builder/builder_utils/utils.go b/legacy/builder/builder_utils/utils.go
@@ -182,9 +182,7 @@ func compileFileWithRecipe(ctx *types.Context, sourcePath *paths.Path, source *p
 		return nil, errors.WithStack(err)
 	}
 
-	pme, release := ctx.PackageManager.NewExplorer()
-	command, err := PrepareCommandForRecipe(properties, recipe, false, pme.GetEnvVarsForSpawnedProcess())
-	release()
+	command, err := PrepareCommandForRecipe(properties, recipe, false, ctx.PackageManager.GetEnvVarsForSpawnedProcess())
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
@@ -413,9 +411,7 @@ func ArchiveCompiledFiles(ctx *types.Context, buildPath *paths.Path, archiveFile
 		properties.SetPath(constants.BUILD_PROPERTIES_ARCHIVE_FILE_PATH, archiveFilePath)
 		properties.SetPath(constants.BUILD_PROPERTIES_OBJECT_FILE, objectFile)
 
-		pme, release := ctx.PackageManager.NewExplorer()
-		command, err := PrepareCommandForRecipe(properties, constants.RECIPE_AR_PATTERN, false, pme.GetEnvVarsForSpawnedProcess())
-		release()
+		command, err := PrepareCommandForRecipe(properties, constants.RECIPE_AR_PATTERN, false, ctx.PackageManager.GetEnvVarsForSpawnedProcess())
 		if err != nil {
 			return nil, errors.WithStack(err)
 		}