Added profile lib-deps install

Author: cmaglie

commands/service_profile_lib_add.go

@@ -20,9 +20,11 @@ import (
 
 	"github.com/arduino/arduino-cli/commands/cmderrors"
 	"github.com/arduino/arduino-cli/commands/internal/instances"
+	"github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex"
 	"github.com/arduino/arduino-cli/internal/arduino/sketch"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	paths "github.com/arduino/go-paths-helper"
+	"go.bug.st/f"
 )
 
 // ProfileLibAdd adds a library to the specified profile or to the default profile.
@@ -48,15 +50,17 @@ func (s *arduinoCoreServerImpl) ProfileLibAdd(ctx context.Context, req *rpc.Prof
 		return nil, err
 	}
 
-	var addedLib *sketch.ProfileLibraryReference
+	var addedLibs []*sketch.ProfileLibraryReference
+	var skippedLibs []*sketch.ProfileLibraryReference
 	if reqLocalLib := req.GetLibrary().GetLocalLibrary(); reqLocalLib != nil {
 		// Add a local library
 		path := paths.New(reqLocalLib.GetPath())
 		if path == nil {
 			return nil, &cmderrors.InvalidArgumentError{Message: "invalid library path"}
 		}
-		addedLib = &sketch.ProfileLibraryReference{InstallDir: path}
+		addedLib := &sketch.ProfileLibraryReference{InstallDir: path}
 		profile.Libraries = append(profile.Libraries, addedLib)
+		addedLibs = append(addedLibs, addedLib)
 	} else if reqIndexLib := req.GetLibrary().GetIndexLibrary(); reqIndexLib != nil {
 		// Obtain the library index from the manager
 		li, err := instances.GetLibrariesIndex(req.GetInstance())
@@ -71,16 +75,43 @@ func (s *arduinoCoreServerImpl) ProfileLibAdd(ctx context.Context, req *rpc.Prof
 		if err != nil {
 			return nil, err
 		}
-		// If the library has been already added to the profile, just update the version
-		if lib, _ := profile.GetLibrary(reqIndexLib.GetName()); lib != nil {
-			lib.Version = libRelease.GetVersion()
-			addedLib = lib
-		} else {
-			addedLib = &sketch.ProfileLibraryReference{
-				Library: reqIndexLib.GetName(),
-				Version: libRelease.GetVersion(),
+
+		add := func(libReleaseToAdd *librariesindex.Release) {
+			libRefToAdd := &sketch.ProfileLibraryReference{
+				Library: libReleaseToAdd.GetName(),
+				Version: libReleaseToAdd.GetVersion(),
+			}
+			existingLibRef, _ := profile.GetLibrary(libReleaseToAdd.GetName())
+			if existingLibRef == nil {
+				profile.Libraries = append(profile.Libraries, libRefToAdd)
+				addedLibs = append(addedLibs, libRefToAdd)
+				return
+			}
+			// If the library has been already added to the profile, just update the version
+			if req.GetNoOverwrite() {
+				skippedLibs = append(skippedLibs, libRefToAdd)
+				return
+			}
+			existingLibRef.Version = libReleaseToAdd.GetVersion()
+			addedLibs = append(addedLibs, existingLibRef)
+		}
+
+		if req.GetAddDependencies() {
+			lme, release, err := instances.GetLibraryManagerExplorer(req.GetInstance())
+			if err != nil {
+				return nil, err
+			}
+			libWithDeps, err := libraryResolveDependencies(lme, li, libRelease.GetName(), libRelease.GetVersion().String(), false)
+			// deps contains the main library as well, so we skip it when adding dependencies
+			release()
+			if err != nil {
+				return nil, err
 			}
-			profile.Libraries = append(profile.Libraries, addedLib)
+			for _, lib := range libWithDeps {
+				add(lib)
+			}
+		} else {
+			add(libRelease)
 		}
 	} else {
 		return nil, &cmderrors.InvalidArgumentError{Message: "library must be specified"}
@@ -91,5 +122,9 @@ func (s *arduinoCoreServerImpl) ProfileLibAdd(ctx context.Context, req *rpc.Prof
 		return nil, err
 	}
 
-	return &rpc.ProfileLibAddResponse{Library: addedLib.ToRpc(), ProfileName: profileName}, nil
+	return &rpc.ProfileLibAddResponse{
+		AddedLibraries:   f.Map(addedLibs, (*sketch.ProfileLibraryReference).ToRpc),
+		SkippedLibraries: f.Map(skippedLibs, (*sketch.ProfileLibraryReference).ToRpc),
+		ProfileName:      profileName,
+	}, nil
 }

internal/cli/profile/lib.go

@@ -28,6 +28,7 @@ import (
 	"github.com/arduino/arduino-cli/internal/i18n"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/spf13/cobra"
+	"go.bug.st/f"
 )
 
 func initLibCommand(srv rpc.ArduinoCoreServiceServer) *cobra.Command {
@@ -96,9 +97,12 @@ func runLibAddCommand(ctx context.Context, args []string, srv rpc.ArduinoCoreSer
 		if err != nil {
 			feedback.Fatal(i18n.Tr("Error adding %s to the profile %s: %v", lib.Name, profileArg.Get(), err), feedback.ErrGeneric)
 		}
+		added := f.Map(resp.GetAddedLibraries(), func(l *rpc.ProfileLibraryReference) *result.ProfileLibraryReference_IndexLibraryResult {
+			return result.NewProfileLibraryReference_IndexLibraryResult(l.GetIndexLibrary())
+		})
 		feedback.PrintResult(libAddResult{
-			Library:     result.NewProfileLibraryReference_IndexLibraryResult(resp.GetLibrary().GetIndexLibrary()),
-			ProfileName: resp.ProfileName})
+			AddedLibraries: added,
+			ProfileName:    resp.ProfileName})
 	}
 }
 
@@ -158,16 +162,24 @@ func runLibRemoveCommand(ctx context.Context, args []string, srv rpc.ArduinoCore
 }
 
 type libAddResult struct {
-	Library     *result.ProfileLibraryReference_IndexLibraryResult `json:"library"`
-	ProfileName string                                             `json:"profile_name"`
+	AddedLibraries   []*result.ProfileLibraryReference_IndexLibraryResult `json:"added_libraries"`
+	SkippedLibraries []*result.ProfileLibraryReference_IndexLibraryResult `json:"skipped_libraries"`
+	ProfileName      string                                               `json:"profile_name"`
 }
 
 func (lr libAddResult) Data() interface{} {
 	return lr
 }
 
 func (lr libAddResult) String() string {
-	return i18n.Tr("Profile %s: %s@%s added successfully", lr.ProfileName, lr.Library.Name, lr.Library.Version)
+	res := ""
+	if len(lr.AddedLibraries) > 0 {
+		res += fmt.Sprintln(i18n.Tr("The following libraries were added to the profile %s:", lr.ProfileName))
+		for _, l := range lr.AddedLibraries {
+			res += fmt.Sprintf("  - %s@%s\n", l.Name, l.Version)
+		}
+	}
+	return res
 }
 
 type libRemoveResult struct {