Refactored some librarymanager functions to query libraries list

Author: cmaglie

arduino/libraries/librariesmanager/librariesmanager.go

@@ -205,26 +205,13 @@ func (lm *LibrariesManager) LoadLibraryFromDir(libRootDir *paths.Path, location
 	return nil
 }
 
-// FindByReference return the installed library matching the Reference
-// name and version or, if the version is nil, the library installed
-// in the User folder.
-func (lm *LibrariesManager) FindByReference(libRef *librariesindex.Reference, installLocation libraries.LibraryLocation) *libraries.Library {
-	alternatives, have := lm.Libraries[libRef.Name]
-	if !have {
+// FindByReference return the installed libraries matching the Reference
+// name and version or, if the version is nil, the libraries installed
+// in the installLocation.
+func (lm *LibrariesManager) FindByReference(libRef *librariesindex.Reference, installLocation libraries.LibraryLocation) libraries.List {
+	alternatives := lm.Libraries[libRef.Name]
+	if alternatives == nil {
 		return nil
 	}
-	// TODO: Move "search into user" into another method...
-	if libRef.Version == nil {
-		for _, candidate := range alternatives {
-			if candidate.Location == installLocation {
-				return candidate
-			}
-		}
-		return nil
-	}
-	res := alternatives.FilterByVersionAndInstallLocation(libRef.Version, installLocation)
-	if len(res) > 0 {
-		return res[0]
-	}
-	return nil
+	return alternatives.FilterByVersionAndInstallLocation(libRef.Version, installLocation)
 }

commands/lib/uninstall.go

@@ -32,13 +32,13 @@ func LibraryUninstall(ctx context.Context, req *rpc.LibraryUninstallRequest, tas
 		return &arduino.InvalidLibraryError{Cause: err}
 	}
 
-	lib := lm.FindByReference(ref, libraries.User)
+	libs := lm.FindByReference(ref, libraries.User)
 
-	if lib == nil {
+	if len(libs) == 0 {
 		taskCB(&rpc.TaskProgress{Message: tr("Library %s is not installed", req.Name), Completed: true})
 	} else {
-		taskCB(&rpc.TaskProgress{Name: tr("Uninstalling %s", lib)})
-		lm.Uninstall(lib)
+		taskCB(&rpc.TaskProgress{Name: tr("Uninstalling %s", libs[0])})
+		lm.Uninstall(libs[0])
 		taskCB(&rpc.TaskProgress{Completed: true})
 	}