findLibraryIndexRelease requires libraries index instead of libraries…

… manager
cmaglie · Dec 22, 2023 · e9546fc · e9546fc
1 parent 9df2fd5
commit e9546fc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/commands/lib/download.go b/commands/lib/download.go
@@ -42,7 +42,7 @@ func LibraryDownload(ctx context.Context, req *rpc.LibraryDownloadRequest, downl
 
 	logrus.Info("Preparing download")
 
-	lib, err := findLibraryIndexRelease(lm, req)
+	lib, err := findLibraryIndexRelease(lm.Index, req)
 	if err != nil {
 		return nil, err
 	}

diff --git a/commands/lib/install.go b/commands/lib/install.go
@@ -72,7 +72,7 @@ func LibraryInstall(ctx context.Context, req *rpc.LibraryInstallRequest, downloa
 	// Find the libReleasesToInstall to install
 	libReleasesToInstall := map[*librariesindex.Release]*librariesmanager.LibraryInstallPlan{}
 	for _, lib := range toInstall {
-		libRelease, err := findLibraryIndexRelease(lm, &rpc.LibraryInstallRequest{
+		libRelease, err := findLibraryIndexRelease(lm.Index, &rpc.LibraryInstallRequest{
 			Name:    lib.GetName(),
 			Version: lib.GetVersionRequired(),
 		})

diff --git a/commands/lib/resolve_deps.go b/commands/lib/resolve_deps.go
@@ -36,7 +36,7 @@ func LibraryResolveDependencies(ctx context.Context, req *rpc.LibraryResolveDepe
 	}
 
 	// Search the requested lib
-	reqLibRelease, err := findLibraryIndexRelease(lm, req)
+	reqLibRelease, err := findLibraryIndexRelease(lm.Index, req)
 	if err != nil {
 		return nil, err
 	}

diff --git a/commands/lib/utils.go b/commands/lib/utils.go
@@ -19,7 +19,6 @@ import (
 	"github.com/arduino/arduino-cli/commands"
 	"github.com/arduino/arduino-cli/commands/cmderrors"
 	"github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex"
-	"github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager"
 )
 
 type libraryReferencer interface {
@@ -36,12 +35,12 @@ func createLibIndexReference(req libraryReferencer) (*librariesindex.Reference,
 	return &librariesindex.Reference{Name: req.GetName(), Version: version}, nil
 }
 
-func findLibraryIndexRelease(lm *librariesmanager.LibrariesManager, req libraryReferencer) (*librariesindex.Release, error) {
+func findLibraryIndexRelease(li *librariesindex.Index, req libraryReferencer) (*librariesindex.Release, error) {
 	ref, err := createLibIndexReference(req)
 	if err != nil {
 		return nil, err
 	}
-	lib := lm.Index.FindRelease(ref)
+	lib := li.FindRelease(ref)
 	if lib == nil {
 		return nil, &cmderrors.LibraryNotFoundError{Library: ref.String()}
 	}