Removed all references to LibraryManger.Index

arduino · cmaglie · Jan 2, 2024 · Dec 27, 2023 · Dec 27, 2023 · Dec 27, 2023
commit f3b52c60ec25bf407ec2bb757d9a2bbea344f6a9
diff --git a/commands/instances.go b/commands/instances.go
@@ -359,7 +359,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 			if !libDir.IsDir() {
 				// Download library
 				taskCallback(&rpc.TaskProgress{Name: tr("Downloading library %s", libraryRef)})
-				libRelease := lm.Index.FindRelease(&librariesindex.Reference{
+				libRelease := li.FindRelease(&librariesindex.Reference{
 					Name:    libraryRef.Library,
 					Version: libraryRef.Version,
 				})

diff --git a/commands/lib/download.go b/commands/lib/download.go
@@ -40,9 +40,14 @@ func LibraryDownload(ctx context.Context, req *rpc.LibraryDownloadRequest, downl
 		return nil, err
 	}
 
+	li, err := instances.GetLibrariesIndex(req.GetInstance())
+	if err != nil {
+		return nil, err
+	}
+
 	logrus.Info("Preparing download")
 
-	lib, err := findLibraryIndexRelease(lm.Index, req)
+	lib, err := findLibraryIndexRelease(li, req)
 	if err != nil {
 		return nil, err
 	}

diff --git a/commands/lib/install.go b/commands/lib/install.go
@@ -33,6 +33,11 @@ import (
 
 // LibraryInstall resolves the library dependencies, then downloads and installs the libraries into the install location.
 func LibraryInstall(ctx context.Context, req *rpc.LibraryInstallRequest, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB) error {
+	li, err := instances.GetLibrariesIndex(req.GetInstance())
+	if err != nil {
+		return err
+	}
+
 	lm, err := instances.GetLibraryManager(req.GetInstance())
 	if err != nil {
 		return err
@@ -72,7 +77,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.Index, &rpc.LibraryInstallRequest{
+		libRelease, err := findLibraryIndexRelease(li, &rpc.LibraryInstallRequest{
 			Name:    lib.GetName(),
 			Version: lib.GetVersionRequired(),
 		})

diff --git a/commands/lib/list.go b/commands/lib/list.go
@@ -42,6 +42,11 @@ func LibraryList(ctx context.Context, req *rpc.LibraryListRequest) (*rpc.Library
 	}
 	defer release()
 
+	li, err := instances.GetLibrariesIndex(req.GetInstance())
+	if err != nil {
+		return nil, err
+	}
+
 	lm, err := instances.GetLibraryManager(req.GetInstance())
 	if err != nil {
 		return nil, err
@@ -51,7 +56,7 @@ func LibraryList(ctx context.Context, req *rpc.LibraryListRequest) (*rpc.Library
 
 	var allLibs []*installedLib
 	if fqbnString := req.GetFqbn(); fqbnString != "" {
-		allLibs = listLibraries(lm, req.GetUpdatable(), true)
+		allLibs = listLibraries(lm, li, req.GetUpdatable(), true)
 		fqbn, err := cores.ParseFQBN(req.GetFqbn())
 		if err != nil {
 			return nil, &cmderrors.InvalidFQBNError{Cause: err}
@@ -91,7 +96,7 @@ func LibraryList(ctx context.Context, req *rpc.LibraryListRequest) (*rpc.Library
 			allLibs = append(allLibs, lib)
 		}
 	} else {
-		allLibs = listLibraries(lm, req.GetUpdatable(), req.GetAll())
+		allLibs = listLibraries(lm, li, req.GetUpdatable(), req.GetAll())
 	}
 
 	installedLibs := []*rpc.InstalledLibrary{}
@@ -118,7 +123,7 @@ func LibraryList(ctx context.Context, req *rpc.LibraryListRequest) (*rpc.Library
 
 // listLibraries returns the list of installed libraries. If updatable is true it
 // returns only the libraries that may be updated.
-func listLibraries(lm *librariesmanager.LibrariesManager, updatable bool, all bool) []*installedLib {
+func listLibraries(lm *librariesmanager.LibrariesManager, li *librariesindex.Index, updatable bool, all bool) []*installedLib {
 	res := []*installedLib{}
 	for _, libAlternatives := range lm.Libraries {
 		for _, lib := range libAlternatives {
@@ -127,7 +132,7 @@ func listLibraries(lm *librariesmanager.LibrariesManager, updatable bool, all bo
 					continue
 				}
 			}
-			available := lm.Index.FindLibraryUpdate(lib)
+			available := li.FindLibraryUpdate(lib)
 			if updatable && available == nil {
 				continue
 			}

diff --git a/commands/lib/resolve_deps.go b/commands/lib/resolve_deps.go
@@ -36,14 +36,19 @@ func LibraryResolveDependencies(ctx context.Context, req *rpc.LibraryResolveDepe
 	}
 
 	// Search the requested lib
-	reqLibRelease, err := findLibraryIndexRelease(lm.Index, req)
+	li, err := instances.GetLibrariesIndex(req.GetInstance())
+	if err != nil {
+		return nil, err
+	}
+
+	reqLibRelease, err := findLibraryIndexRelease(li, req)
 	if err != nil {
 		return nil, err
 	}
 
 	// Extract all installed libraries
 	installedLibs := map[string]*libraries.Library{}
-	for _, lib := range listLibraries(lm, false, false) {
+	for _, lib := range listLibraries(lm, li, false, false) {
 		installedLibs[lib.Library.Name] = lib.Library
 	}
 
@@ -53,7 +58,7 @@ func LibraryResolveDependencies(ctx context.Context, req *rpc.LibraryResolveDepe
 		libs := lm.FindAllInstalled()
 		libs = libs.FilterByVersionAndInstallLocation(nil, libraries.User)
 		for _, lib := range libs {
-			release := lm.Index.FindRelease(&librariesindex.Reference{
+			release := li.FindRelease(&librariesindex.Reference{
 				Name:    lib.Name,
 				Version: lib.Version,
 			})
@@ -62,13 +67,13 @@ func LibraryResolveDependencies(ctx context.Context, req *rpc.LibraryResolveDepe
 			}
 		}
 	}
-	deps := lm.Index.ResolveDependencies(reqLibRelease, overrides)
+	deps := li.ResolveDependencies(reqLibRelease, overrides)
 
 	// If no solution has been found
 	if len(deps) == 0 {
 		// Check if there is a problem with the first level deps
 		for _, directDep := range reqLibRelease.GetDependencies() {
-			if _, ok := lm.Index.Libraries[directDep.GetName()]; !ok {
+			if _, ok := li.Libraries[directDep.GetName()]; !ok {
 				err := errors.New(tr("dependency '%s' is not available", directDep.GetName()))
 				return nil, &cmderrors.LibraryDependenciesResolutionFailedError{Cause: err}
 			}

diff --git a/commands/lib/upgrade.go b/commands/lib/upgrade.go
@@ -26,12 +26,17 @@ import (
 
 // LibraryUpgradeAll upgrades all the available libraries
 func LibraryUpgradeAll(req *rpc.LibraryUpgradeAllRequest, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB) error {
+	li, err := instances.GetLibrariesIndex(req.GetInstance())
+	if err != nil {
+		return err
+	}
+
 	lm, err := instances.GetLibraryManager(req.GetInstance())
 	if err != nil {
 		return err
 	}
 
-	if err := upgrade(req.GetInstance(), listLibraries(lm, true, false), downloadCB, taskCB); err != nil {
+	if err := upgrade(req.GetInstance(), listLibraries(lm, li, true, false), downloadCB, taskCB); err != nil {
 		return err
 	}
 
@@ -44,14 +49,19 @@ func LibraryUpgradeAll(req *rpc.LibraryUpgradeAllRequest, downloadCB rpc.Downloa
 
 // LibraryUpgrade upgrades a library
 func LibraryUpgrade(ctx context.Context, req *rpc.LibraryUpgradeRequest, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB) error {
+	li, err := instances.GetLibrariesIndex(req.GetInstance())
+	if err != nil {
+		return err
+	}
+
 	lm, err := instances.GetLibraryManager(req.GetInstance())
 	if err != nil {
 		return err
 	}
 
 	// Get the library to upgrade
 	name := req.GetName()
-	lib := filterByName(listLibraries(lm, false, false), name)
+	lib := filterByName(listLibraries(lm, li, false, false), name)
 	if lib == nil {
 		// library not installed...
 		return &cmderrors.LibraryNotFoundError{Library: name}

diff --git a/internal/arduino/libraries/librariesmanager/librariesmanager.go b/internal/arduino/libraries/librariesmanager/librariesmanager.go
@@ -37,7 +37,6 @@ import (
 type LibrariesManager struct {
 	LibrariesDir []*LibrariesDir
 	Libraries    map[string]libraries.List `json:"libraries"`
-	// TODO: Fix all access to lm.Index left around
 	DownloadsDir *paths.Path
 }
 
@@ -73,7 +72,6 @@ func NewLibraryManager(downloadsDir *paths.Path) *LibrariesManager {
 	return &LibrariesManager{
 		Libraries:    map[string]libraries.List{},
 		DownloadsDir: downloadsDir,
-		Index:        librariesindex.EmptyIndex,
 	}
 }