Set builtin libraries dir by default when running as a daemon

Author: cmaglie

cli/daemon/daemon.go

@@ -72,6 +72,9 @@ func NewCommand() *cobra.Command {
 func runDaemonCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino-cli daemon`")
 
+	// Bundled libraries support is enabled by default when running as a daemon
+	configuration.Settings.SetDefault("directories.builtin.Libraries", configuration.GetDefaultBuiltinLibrariesDir())
+
 	port := configuration.Settings.GetString("daemon.port")
 	gRPCOptions := []grpc.ServerOption{}
 	if debugFile != "" {

configuration/configuration.go

@@ -131,6 +131,11 @@ func getDefaultUserDir() string {
 	}
 }
 
+// GetDefaultBuiltinLibrariesDir returns the full path to the default builtin libraries dir
+func GetDefaultBuiltinLibrariesDir() string {
+	return filepath.Join(getDefaultArduinoDataDir(), "libraries")
+}
+
 // FindConfigFileInArgsOrWorkingDirectory returns the config file path using the
 // argument '--config-file' (if specified) or looking in the current working dir
 func FindConfigFileInArgsOrWorkingDirectory(args []string) string {

internal/integrationtest/daemon/daemon_lib_install_test.go

@@ -17,7 +17,6 @@ package daemon_test
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"io"
 	"testing"
@@ -35,35 +34,6 @@ func TestDaemonBundleLibInstall(t *testing.T) {
 		fmt.Printf("INIT> %v\n", ir.GetMessage())
 	}))
 
-	// Install libraries in bundled dir (should fail)
-	{
-		instCl, err := grpcInst.LibraryInstall(context.Background(), "Arduino_BuiltIn", "", false, false, true)
-		require.NoError(t, err)
-		for {
-			msg, err := instCl.Recv()
-			if err == io.EOF {
-				require.FailNow(t, "LibraryInstall is supposed to fail because builtin libraries directory is not set")
-			}
-			if err != nil {
-				fmt.Println("LIB INSTALL ERROR:", err)
-				break
-			}
-			fmt.Printf("LIB INSTALL> %+v\n", msg)
-		}
-	}
-
-	// Set builtin libraries dir
-	builtinLibsDir := cli.DataDir().Join("libraries")
-	jsonBuiltinLibsDir, err := json.Marshal(builtinLibsDir)
-	require.NoError(t, err)
-	err = cli.SetValue("directories.builtin.libraries", string(jsonBuiltinLibsDir))
-	require.NoError(t, err)
-
-	// Re-init
-	require.NoError(t, grpcInst.Init("", "", func(ir *commands.InitResponse) {
-		fmt.Printf("INIT> %v\n", ir.GetMessage())
-	}))
-
 	// Install libraries in bundled dir
 	{
 		instCl, err := grpcInst.LibraryInstall(context.Background(), "Arduino_BuiltIn", "", false, false, true)
@@ -123,4 +93,30 @@ func TestDaemonBundleLibInstall(t *testing.T) {
 		require.Equal(t, libsAndLocation["SD"], commands.LibraryLocation_LIBRARY_LOCATION_BUILTIN)
 		require.Equal(t, libsAndLocation["Firmata"], commands.LibraryLocation_LIBRARY_LOCATION_BUILTIN)
 	}
+
+	// Un-Set builtin libraries dir
+	err := cli.SetValue("directories.builtin.libraries", `""`)
+	require.NoError(t, err)
+
+	// Re-init
+	require.NoError(t, grpcInst.Init("", "", func(ir *commands.InitResponse) {
+		fmt.Printf("INIT> %v\n", ir.GetMessage())
+	}))
+
+	// Install libraries in bundled dir (should now fail)
+	{
+		instCl, err := grpcInst.LibraryInstall(context.Background(), "Arduino_BuiltIn", "", false, false, true)
+		require.NoError(t, err)
+		for {
+			msg, err := instCl.Recv()
+			if err == io.EOF {
+				require.FailNow(t, "LibraryInstall is supposed to fail because builtin libraries directory is not set")
+			}
+			if err != nil {
+				fmt.Println("LIB INSTALL ERROR:", err)
+				break
+			}
+			fmt.Printf("LIB INSTALL> %+v\n", msg)
+		}
+	}
 }