Added automatic lib deps add to profile

Author: cmaglie

commands/service_profile_lib_add.go

@@ -87,6 +87,11 @@ func (s *arduinoCoreServerImpl) ProfileLibAdd(ctx context.Context, req *rpc.Prof
 				addedLibs = append(addedLibs, libRefToAdd)
 				return
 			}
+			// If the same version of the library has been already added to the profile, skip it
+			if existingLibRef.Version.Equal(libReleaseToAdd.GetVersion()) {
+				skippedLibs = append(skippedLibs, libRefToAdd)
+				return
+			}
 			// If the library has been already added to the profile, just update the version
 			if req.GetNoOverwrite() {
 				skippedLibs = append(skippedLibs, libRefToAdd)

internal/cli/profile/lib.go

@@ -49,7 +49,8 @@ func initLibCommand(srv rpc.ArduinoCoreServiceServer) *cobra.Command {
 
 func initLibAddCommand(srv rpc.ArduinoCoreServiceServer) *cobra.Command {
 	var destDir string
-
+	var noDeps bool
+	var noOverwrite bool
 	addCommand := &cobra.Command{
 		Use:   fmt.Sprintf("add %s[@%s]...", i18n.Tr("LIBRARY"), i18n.Tr("VERSION_NUMBER")),
 		Short: i18n.Tr("Adds a library to the profile."),
@@ -59,27 +60,31 @@ func initLibAddCommand(srv rpc.ArduinoCoreServiceServer) *cobra.Command {
 			"  " + os.Args[0] + " profile lib add Arduino_JSON@0.2.0 --profile my_profile\n",
 		Args: cobra.MinimumNArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
-			runLibAddCommand(cmd.Context(), args, srv, destDir)
+			runLibAddCommand(cmd.Context(), args, srv, destDir, noDeps, noOverwrite)
 		},
 		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 			return arguments.GetInstallableLibs(cmd.Context(), srv), cobra.ShellCompDirectiveDefault
 		},
 	}
 
 	addCommand.Flags().StringVar(&destDir, "dest-dir", "", i18n.Tr("Location of the sketch project file."))
+	addCommand.Flags().BoolVar(&noDeps, "no-deps", false, i18n.Tr("Do not add dependencies."))
+	addCommand.Flags().BoolVar(&noOverwrite, "no-overwrite", false, i18n.Tr("Do not overwrite already added libraries."))
+
 	profileArg.AddToCommand(addCommand, srv)
 
 	return addCommand
 }
 
-func runLibAddCommand(ctx context.Context, args []string, srv rpc.ArduinoCoreServiceServer, destDir string) {
+func runLibAddCommand(ctx context.Context, args []string, srv rpc.ArduinoCoreServiceServer, destDir string, noAddDeps, noOverwrite bool) {
 	sketchPath := arguments.InitSketchPath(destDir)
 
 	instance := instance.CreateAndInit(ctx, srv)
 	libRefs, err := lib.ParseLibraryReferenceArgsAndAdjustCase(ctx, srv, instance, args)
 	if err != nil {
 		feedback.Fatal(i18n.Tr("Arguments error: %v", err), feedback.ErrBadArgument)
 	}
+	addDeps := !noAddDeps
 	for _, lib := range libRefs {
 		resp, err := srv.ProfileLibAdd(ctx, &rpc.ProfileLibAddRequest{
 			Instance:    instance,
@@ -93,16 +98,23 @@ func runLibAddCommand(ctx context.Context, args []string, srv rpc.ArduinoCoreSer
 					},
 				},
 			},
+			AddDependencies: &addDeps,
+			NoOverwrite:     &noOverwrite,
 		})
 		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())
 		})
+		skipped := f.Map(resp.GetSkippedLibraries(), func(l *rpc.ProfileLibraryReference) *result.ProfileLibraryReference_IndexLibraryResult {
+			return result.NewProfileLibraryReference_IndexLibraryResult(l.GetIndexLibrary())
+		})
 		feedback.PrintResult(libAddResult{
-			AddedLibraries: added,
-			ProfileName:    resp.ProfileName})
+			AddedLibraries:   added,
+			SkippedLibraries: skipped,
+			ProfileName:      resp.ProfileName,
+		})
 	}
 }
 
@@ -179,6 +191,12 @@ func (lr libAddResult) String() string {
 			res += fmt.Sprintf("  - %s@%s\n", l.Name, l.Version)
 		}
 	}
+	if len(lr.SkippedLibraries) > 0 {
+		res += fmt.Sprintln(i18n.Tr("The following libraries were already present in the profile %s and were not modified:", lr.ProfileName))
+		for _, l := range lr.SkippedLibraries {
+			res += fmt.Sprintf("  - %s@%s\n", l.Name, l.Version)
+		}
+	}
 	return res
 }