Slighlt refactored libraryResolveDependencies

This change makes the function libraryResolveDependencies a bit more
generic, moving the rpc-related conversion into the gRPC method.
This is useful for the next commits and, as a nice bonus, has also
made more straighforward the exising InstallLibrary implementation.

Author: cmaglie

commands/service_library_install.go

@@ -67,31 +67,36 @@ func (s *arduinoCoreServerImpl) LibraryInstall(req *rpc.LibraryInstallRequest, s
 		return err
 	}
 
-	toInstall := map[string]*rpc.LibraryDependencyStatus{}
+	toInstall := map[string]*librariesindex.Release{}
 	if req.GetNoDeps() {
-		toInstall[req.GetName()] = &rpc.LibraryDependencyStatus{
-			Name:            req.GetName(),
-			VersionRequired: req.GetVersion(),
+		version, err := parseVersion(req.GetVersion())
+		if err != nil {
+			return err
+		}
+		libRelease, err := li.FindRelease(req.GetName(), version)
+		if err != nil {
+			return err
 		}
+		toInstall[libRelease.GetName()] = libRelease
 	} else {
 		// Obtain the library explorer from the instance
 		lme, releaseLme, err := instances.GetLibraryManagerExplorer(req.GetInstance())
 		if err != nil {
 			return err
 		}
 
-		res, err := libraryResolveDependencies(lme, li, req.GetName(), req.GetVersion(), req.GetNoOverwrite())
+		deps, err := libraryResolveDependencies(lme, li, req.GetName(), req.GetVersion(), req.GetNoOverwrite())
 		releaseLme()
 		if err != nil {
 			return err
 		}
 
-		for _, dep := range res.GetDependencies() {
+		for _, dep := range deps {
 			if existingDep, has := toInstall[dep.GetName()]; has {
-				if existingDep.GetVersionRequired() != dep.GetVersionRequired() {
+				if !existingDep.GetVersion().Equal(dep.GetVersion()) {
 					err := errors.New(
 						i18n.Tr("two different versions of the library %[1]s are required: %[2]s and %[3]s",
-							dep.GetName(), dep.GetVersionRequired(), existingDep.GetVersionRequired()))
+							dep.GetName(), dep.GetVersion(), existingDep.GetVersion()))
 					return &cmderrors.LibraryDependenciesResolutionFailedError{Cause: err}
 				}
 			}
@@ -118,16 +123,7 @@ func (s *arduinoCoreServerImpl) LibraryInstall(req *rpc.LibraryInstallRequest, s
 	// Find the libReleasesToInstall to install
 	libReleasesToInstall := map[*librariesindex.Release]*librariesmanager.LibraryInstallPlan{}
 	installLocation := libraries.FromRPCLibraryInstallLocation(req.GetInstallLocation())
-	for _, lib := range toInstall {
-		version, err := parseVersion(lib.GetVersionRequired())
-		if err != nil {
-			return err
-		}
-		libRelease, err := li.FindRelease(lib.GetName(), version)
-		if err != nil {
-			return err
-		}
-
+	for _, libRelease := range toInstall {
 		installTask, err := lmi.InstallPrerequisiteCheck(libRelease.Library.Name, libRelease.Version, installLocation)
 		if err != nil {
 			return err

commands/service_library_resolve_deps.go

@@ -43,11 +43,40 @@ func (s *arduinoCoreServerImpl) LibraryResolveDependencies(ctx context.Context,
 		return nil, err
 	}
 
-	return libraryResolveDependencies(lme, li, req.GetName(), req.GetVersion(), req.GetDoNotUpdateInstalledLibraries())
+	deps, err := libraryResolveDependencies(lme, li, req.GetName(), req.GetVersion(), req.GetDoNotUpdateInstalledLibraries())
+
+	// Extract all installed libraries
+	installedLibs := map[string]*libraries.Library{}
+	for _, lib := range listLibraries(lme, li, false, false) {
+		installedLibs[lib.Library.Name] = lib.Library
+	}
+
+	res := []*rpc.LibraryDependencyStatus{}
+	for _, dep := range deps {
+		// ...and add information on currently installed versions of the libraries
+		var installed *semver.Version
+		required := dep.GetVersion()
+		if installedLib, has := installedLibs[dep.GetName()]; has {
+			installed = installedLib.Version
+			if installed != nil && required != nil && installed.Equal(required) {
+				// avoid situations like installed=0.53 and required=0.53.0
+				required = installed
+			}
+		}
+		res = append(res, &rpc.LibraryDependencyStatus{
+			Name:             dep.GetName(),
+			VersionRequired:  required.String(),
+			VersionInstalled: installed.String(),
+		})
+	}
+	sort.Slice(res, func(i, j int) bool {
+		return res[i].GetName() < res[j].GetName()
+	})
+	return &rpc.LibraryResolveDependenciesResponse{Dependencies: res}, nil
 }
 
 func libraryResolveDependencies(lme *librariesmanager.Explorer, li *librariesindex.Index,
-	reqName, reqVersion string, noOverwrite bool) (*rpc.LibraryResolveDependenciesResponse, error) {
+	reqName, reqVersion string, noOverwrite bool) ([]*librariesindex.Release, error) {
 	version, err := parseVersion(reqVersion)
 	if err != nil {
 		return nil, err
@@ -59,12 +88,6 @@ func libraryResolveDependencies(lme *librariesmanager.Explorer, li *librariesind
 		return nil, err
 	}
 
-	// Extract all installed libraries
-	installedLibs := map[string]*libraries.Library{}
-	for _, lib := range listLibraries(lme, li, false, false) {
-		installedLibs[lib.Library.Name] = lib.Library
-	}
-
 	// Resolve all dependencies...
 	var overrides []*librariesindex.Release
 	if noOverwrite {
@@ -92,26 +115,5 @@ func libraryResolveDependencies(lme *librariesmanager.Explorer, li *librariesind
 		return nil, &cmderrors.LibraryDependenciesResolutionFailedError{}
 	}
 
-	res := []*rpc.LibraryDependencyStatus{}
-	for _, dep := range deps {
-		// ...and add information on currently installed versions of the libraries
-		var installed *semver.Version
-		required := dep.GetVersion()
-		if installedLib, has := installedLibs[dep.GetName()]; has {
-			installed = installedLib.Version
-			if installed != nil && required != nil && installed.Equal(required) {
-				// avoid situations like installed=0.53 and required=0.53.0
-				required = installed
-			}
-		}
-		res = append(res, &rpc.LibraryDependencyStatus{
-			Name:             dep.GetName(),
-			VersionRequired:  required.String(),
-			VersionInstalled: installed.String(),
-		})
-	}
-	sort.Slice(res, func(i, j int) bool {
-		return res[i].GetName() < res[j].GetName()
-	})
-	return &rpc.LibraryResolveDependenciesResponse{Dependencies: res}, nil
+	return deps, nil
 }