ProfileAddLibrary now accepts a full ProfileLibraryReference object

Author: cmaglie

commands/service_profile_lib_add.go

@@ -48,34 +48,48 @@ func (s *arduinoCoreServerImpl) ProfileLibAdd(ctx context.Context, req *rpc.Prof
 		return nil, err
 	}
 
-	// Obtain the library index from the manager
-	li, err := instances.GetLibrariesIndex(req.GetInstance())
-	if err != nil {
-		return nil, err
-	}
-	version, err := parseVersion(req.LibVersion)
-	if err != nil {
-		return nil, err
-	}
-	libRelease, err := li.FindRelease(req.GetLibName(), version)
-	if err != nil {
-		return nil, err
-	}
-
-	// If the library has been already added to the profile, just update the version
-	if lib, _ := profile.GetLibrary(req.LibName, false); lib != nil {
-		lib.Version = libRelease.GetVersion()
+	var addedLib *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}
+		profile.Libraries = append(profile.Libraries, addedLib)
+	} else if reqIndexLib := req.GetLibrary().GetIndexLibrary(); reqIndexLib != nil {
+		// Obtain the library index from the manager
+		li, err := instances.GetLibrariesIndex(req.GetInstance())
+		if err != nil {
+			return nil, err
+		}
+		version, err := parseVersion(reqIndexLib.GetVersion())
+		if err != nil {
+			return nil, err
+		}
+		libRelease, err := li.FindRelease(reqIndexLib.GetName(), version)
+		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(), false); lib != nil {
+			lib.Version = libRelease.GetVersion()
+			addedLib = lib
+		} else {
+			addedLib = &sketch.ProfileLibraryReference{
+				Library: reqIndexLib.GetName(),
+				Version: libRelease.GetVersion(),
+			}
+			profile.Libraries = append(profile.Libraries, addedLib)
+		}
 	} else {
-		profile.Libraries = append(profile.Libraries, &sketch.ProfileLibraryReference{
-			Library: req.GetLibName(),
-			Version: libRelease.GetVersion(),
-		})
+		return nil, &cmderrors.InvalidArgumentError{Message: "library must be specified"}
 	}
 
 	err = projectFilePath.WriteFile([]byte(sk.Project.AsYaml()))
 	if err != nil {
 		return nil, err
 	}
 
-	return &rpc.ProfileLibAddResponse{LibName: req.LibName, LibVersion: libRelease.GetVersion().String(), ProfileName: profileName}, nil
+	return &rpc.ProfileLibAddResponse{Library: addedLib.ToRpc(), ProfileName: profileName}, nil
 }

internal/cli/profile/lib.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/arduino/arduino-cli/internal/cli/arguments"
 	"github.com/arduino/arduino-cli/internal/cli/feedback"
+	"github.com/arduino/arduino-cli/internal/cli/feedback/result"
 	"github.com/arduino/arduino-cli/internal/cli/instance"
 	"github.com/arduino/arduino-cli/internal/cli/lib"
 	"github.com/arduino/arduino-cli/internal/i18n"
@@ -83,13 +84,21 @@ func runLibAddCommand(ctx context.Context, args []string, srv rpc.ArduinoCoreSer
 			Instance:    instance,
 			SketchPath:  sketchPath.String(),
 			ProfileName: profileArg.Get(),
-			LibName:     lib.Name,
-			LibVersion:  lib.Version,
+			Library: &rpc.ProfileLibraryReference{
+				Library: &rpc.ProfileLibraryReference_IndexLibrary_{
+					IndexLibrary: &rpc.ProfileLibraryReference_IndexLibrary{
+						Name:    lib.Name,
+						Version: lib.Version,
+					},
+				},
+			},
 		})
 		if err != nil {
 			feedback.Fatal(i18n.Tr("Error adding %s to the profile %s: %v", lib.Name, profileArg.Get(), err), feedback.ErrGeneric)
 		}
-		feedback.PrintResult(libAddResult{LibName: resp.GetLibName(), LibVersion: resp.GetLibVersion(), ProfileName: resp.ProfileName})
+		feedback.PrintResult(libAddResult{
+			Library:     result.NewProfileLibraryReference_IndexLibraryResult(resp.GetLibrary().GetIndexLibrary()),
+			ProfileName: resp.ProfileName})
 	}
 }
 
@@ -140,17 +149,16 @@ func runLibRemoveCommand(ctx context.Context, args []string, srv rpc.ArduinoCore
 }
 
 type libAddResult struct {
-	LibName     string `json:"library_name"`
-	LibVersion  string `json:"library_version"`
-	ProfileName string `json:"profile_name"`
+	Library     *result.ProfileLibraryReference_IndexLibraryResult `json:"library"`
+	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.LibName, lr.LibVersion)
+	return i18n.Tr("Profile %s: %s@%s added successfully", lr.ProfileName, lr.Library.Name, lr.Library.Version)
 }
 
 type libRemoveResult struct {