Moved directories init out of commands/internal/instances

Author: cmaglie

commands/instances.go

@@ -61,7 +61,26 @@ func installTool(pm *packagemanager.PackageManager, tool *cores.ToolRelease, dow
 
 // Create a new CoreInstance ready to be initialized, supporting directories are also created.
 func Create(req *rpc.CreateRequest, extraUserAgent ...string) (*rpc.CreateResponse, error) {
-	inst, err := instances.Create(extraUserAgent...)
+	// Setup downloads directory
+	downloadsDir := configuration.DownloadsDir(configuration.Settings)
+	if downloadsDir.NotExist() {
+		err := downloadsDir.MkdirAll()
+		if err != nil {
+			return nil, &cmderrors.PermissionDeniedError{Message: tr("Failed to create downloads directory"), Cause: err}
+		}
+	}
+
+	// Setup data directory
+	dataDir := configuration.DataDir(configuration.Settings)
+	packagesDir := configuration.PackagesDir(configuration.Settings)
+	if packagesDir.NotExist() {
+		err := packagesDir.MkdirAll()
+		if err != nil {
+			return nil, &cmderrors.PermissionDeniedError{Message: tr("Failed to create data directory"), Cause: err}
+		}
+	}
+
+	inst, err := instances.Create(dataDir, packagesDir, downloadsDir, extraUserAgent...)
 	if err != nil {
 		return nil, err
 	}

commands/internal/instances/instances.go

@@ -3,17 +3,13 @@ package instances
 import (
 	"sync"
 
-	"github.com/arduino/arduino-cli/commands/cmderrors"
-	"github.com/arduino/arduino-cli/i18n"
 	"github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager"
-	"github.com/arduino/arduino-cli/internal/cli/configuration"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/arduino/arduino-cli/version"
+	"github.com/arduino/go-paths-helper"
 )
 
-var tr = i18n.Tr
-
 // coreInstance is an instance of the Arduino Core Services. The user can
 // instantiate as many as needed by providing a different configuration
 // for each one.
@@ -74,45 +70,18 @@ func SetLibraryManager(inst *rpc.Instance, lm *librariesmanager.LibrariesManager
 	return true
 }
 
-// Create a new *rpc.Instance ready to be initialized, supporting directories are also created.
-func Create(extraUserAgent ...string) (*rpc.Instance, error) {
+// Create a new *rpc.Instance ready to be initialized
+func Create(dataDir, packagesDir, downloadsDir *paths.Path, extraUserAgent ...string) (*rpc.Instance, error) {
 	instance := &coreInstance{}
 
-	// Setup downloads directory
-	downloadsDir := configuration.DownloadsDir(configuration.Settings)
-	if downloadsDir.NotExist() {
-		err := downloadsDir.MkdirAll()
-		if err != nil {
-			return nil, &cmderrors.PermissionDeniedError{Message: tr("Failed to create downloads directory"), Cause: err}
-		}
-	}
-
-	// Setup data directory
-	dataDir := configuration.DataDir(configuration.Settings)
-	packagesDir := configuration.PackagesDir(configuration.Settings)
-	if packagesDir.NotExist() {
-		err := packagesDir.MkdirAll()
-		if err != nil {
-			return nil, &cmderrors.PermissionDeniedError{Message: tr("Failed to create data directory"), Cause: err}
-		}
-	}
-
 	// Create package manager
 	userAgent := "arduino-cli/" + version.VersionInfo.VersionString
 	for _, ua := range extraUserAgent {
 		userAgent += " " + ua
 	}
-	instance.pm = packagemanager.NewBuilder(
-		dataDir,
-		configuration.PackagesDir(configuration.Settings),
-		downloadsDir,
-		dataDir.Join("tmp"),
-		userAgent,
-	).Build()
-	instance.lm = librariesmanager.NewLibraryManager(
-		dataDir,
-		downloadsDir,
-	)
+	tempDir := dataDir.Join("tmp")
+	instance.pm = packagemanager.NewBuilder(dataDir, packagesDir, downloadsDir, tempDir, userAgent).Build()
+	instance.lm = librariesmanager.NewLibraryManager(dataDir, downloadsDir)
 
 	// Save instance
 	instancesMux.Lock()