downloadLibrary do not require a libmanager but just the downloadDir

arduino · cmaglie · Jan 2, 2024 · Dec 27, 2023 · Dec 27, 2023 · Dec 27, 2023
commit 39f156748c3a7ebc5438aae916a0d769f564b7e9
diff --git a/commands/lib/download.go b/commands/lib/download.go
@@ -22,9 +22,9 @@ import (
 	"github.com/arduino/arduino-cli/commands/internal/instances"
 	"github.com/arduino/arduino-cli/internal/arduino/httpclient"
 	"github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex"
-	"github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager"
 	"github.com/arduino/arduino-cli/internal/i18n"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
+	"github.com/arduino/go-paths-helper"
 	"github.com/sirupsen/logrus"
 )

@@ -35,9 +35,12 @@ var tr = i18n.Tr
 func LibraryDownload(ctx context.Context, req *rpc.LibraryDownloadRequest, downloadCB rpc.DownloadProgressCB) (*rpc.LibraryDownloadResponse, error) {
 	logrus.Info("Executing `arduino-cli lib download`")

-	lm, err := instances.GetLibraryManager(req.GetInstance())
-	if err != nil {
+	var downloadsDir *paths.Path
+	if pme, release, err := instances.GetPackageManagerExplorer(req.GetInstance()); err != nil {
 		return nil, err
+	} else {
+		downloadsDir = pme.DownloadDir
+		release()
 	}

 	li, err := instances.GetLibrariesIndex(req.GetInstance())
@@ -52,22 +55,22 @@ func LibraryDownload(ctx context.Context, req *rpc.LibraryDownloadRequest, downl
 		return nil, err
 	}

-	if err := downloadLibrary(lm, lib, downloadCB, func(*rpc.TaskProgress) {}, "download"); err != nil {
+	if err := downloadLibrary(downloadsDir, lib, downloadCB, func(*rpc.TaskProgress) {}, "download"); err != nil {
 		return nil, err
 	}

 	return &rpc.LibraryDownloadResponse{}, nil
 }

-func downloadLibrary(lm *librariesmanager.LibrariesManager, libRelease *librariesindex.Release,
+func downloadLibrary(downloadsDir *paths.Path, libRelease *librariesindex.Release,
 	downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB, queryParameter string) error {

 	taskCB(&rpc.TaskProgress{Name: tr("Downloading %s", libRelease)})
 	config, err := httpclient.GetDownloaderConfig()
 	if err != nil {
 		return &cmderrors.FailedDownloadError{Message: tr("Can't download library"), Cause: err}
 	}
-	if err := libRelease.Resource.Download(lm.DownloadsDir, config, libRelease.String(), downloadCB, queryParameter); err != nil {
+	if err := libRelease.Resource.Download(downloadsDir, config, libRelease.String(), downloadCB, queryParameter); err != nil {
 		return &cmderrors.FailedDownloadError{Message: tr("Can't download library"), Cause: err}
 	}
 	taskCB(&rpc.TaskProgress{Completed: true})

diff --git a/commands/lib/install.go b/commands/lib/install.go
@@ -74,6 +74,15 @@ func LibraryInstall(ctx context.Context, req *rpc.LibraryInstallRequest, downloa
 		}
 	}

+	// Obtain the download directory
+	var downloadsDir *paths.Path
+	if pme, releasePme, err := instances.GetPackageManagerExplorer(req.GetInstance()); err != nil {
+		return err
+	} else {
+		downloadsDir = pme.DownloadDir
+		releasePme()
+	}
+
 	// Find the libReleasesToInstall to install
 	libReleasesToInstall := map[*librariesindex.Release]*librariesmanager.LibraryInstallPlan{}
 	for _, lib := range toInstall {
@@ -114,7 +123,7 @@ func LibraryInstall(ctx context.Context, req *rpc.LibraryInstallRequest, downloa
 				downloadReason += "-builtin"
 			}
 		}
-		if err := downloadLibrary(lm, libRelease, downloadCB, taskCB, downloadReason); err != nil {
+		if err := downloadLibrary(downloadsDir, libRelease, downloadCB, taskCB, downloadReason); err != nil {
 			return err
 		}
 		if err := installLibrary(lm, libRelease, installTask, taskCB); err != nil {