Move all .local content

Author: martacarbone

debian/arduino-app-cli/DEBIAN/postinst

@@ -1,8 +1,10 @@
 #!/bin/sh
 
-chown -R arduino:arduino /home/arduino/.local/share/arduino-app-cli
+#chown -R arduino:arduino /home/arduino/.local/share/arduino-app-cli
 mkdir /var/cache/arduino-app-cli
 chown -R arduino:arduino /var/cache/arduino-app-cli
+mkdir /home/arduino/.arduino-app-cli
+chown -R arduino:arduino /home/arduino/.arduino-app-cli
 
 systemctl enable arduino-app-cli
 systemctl enable arduino-burn-bootloader

debian/arduino-app-cli/DEBIAN/postrm

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# TODO delete /var/cache
+rm -rf /var/cache/arduino-app-cli
+
 if [ -d /run/systemd/system ]; then
   systemctl daemon-reload
 fi

debian/arduino-app-cli/DEBIAN/prerm

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# TODO cache should be invalidated
-
 systemctl disable arduino-app-cli
 systemctl disable arduino-burn-bootloader
 systemctl disable arduino-avahi-serial.service

internal/api/handlers/properties.go

@@ -20,16 +20,26 @@ import (
 	"io"
 	"log/slog"
 	"net/http"
+	"os"
 
 	"github.com/arduino/arduino-app-cli/internal/api/models"
 	"github.com/arduino/arduino-app-cli/internal/orchestrator/config"
 	properties "github.com/arduino/arduino-app-cli/internal/orchestrator/system_properties"
 	"github.com/arduino/arduino-app-cli/internal/render"
+	"github.com/arduino/go-paths-helper"
 )
 
+func getPropertiesDir() string {
+	xdgHome, _ := os.UserHomeDir()
+	//if err != nil {
+	//	slog.Error("Unable to retrieve list", slog.String("error", err.Error()))
+	//}
+	return paths.New(xdgHome).Join(".arduino-app-cli", "properties.msgpack").String()
+}
+
 func HandlePropertyKeys(cfg config.Configuration) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		propertyList, err := properties.ReadPropertyKeys(cfg.DataDir().Join("properties.msgpack").String())
+		propertyList, err := properties.ReadPropertyKeys(getPropertiesDir())
 		if err != nil {
 			slog.Error("Unable to retrieve list", slog.String("error", err.Error()))
 			render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the list"})
@@ -43,7 +53,7 @@ func HandlePropertyGet(cfg config.Configuration) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		key := r.PathValue("key")
 
-		property, found, err := properties.GetProperty(cfg.DataDir().Join("properties.msgpack").String(), key)
+		property, found, err := properties.GetProperty(getPropertiesDir(), key)
 		if err != nil {
 			if errors.Is(err, properties.ErrInvalidKey) {
 				render.EncodeResponse(w, http.StatusBadRequest, models.ErrorResponse{Details: err.Error()})
@@ -79,7 +89,7 @@ func HandlePropertyUpsert(cfg config.Configuration) http.HandlerFunc {
 			return
 		}
 
-		err = properties.UpsertProperty(cfg.DataDir().Join("properties.msgpack").String(), key, reqBody)
+		err = properties.UpsertProperty(getPropertiesDir(), key, reqBody)
 		if err != nil {
 			if errors.Is(err, properties.ErrInvalidKey) {
 				render.EncodeResponse(w, http.StatusBadRequest, models.ErrorResponse{Details: err.Error()})
@@ -96,7 +106,7 @@ func HandlePropertyUpsert(cfg config.Configuration) http.HandlerFunc {
 func HandlePropertyDelete(cfg config.Configuration) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		key := r.PathValue("key")
-		found, err := properties.DeleteProperty(cfg.DataDir().Join("properties.msgpack").String(), key)
+		found, err := properties.DeleteProperty(getPropertiesDir(), key)
 		if err != nil {
 			if errors.Is(err, properties.ErrInvalidKey) {
 				render.EncodeResponse(w, http.StatusBadRequest, models.ErrorResponse{Details: err.Error()})

internal/orchestrator/app/app.go

@@ -20,7 +20,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"log/slog"
 	"os"
 	"path/filepath"
 
@@ -150,7 +149,6 @@ func (a *ArduinoApp) SketchBuildPath() *paths.Path {
 func (a *ArduinoApp) ProvisioningStateDir() *paths.Path {
 	cachePath := filepath.Join("/", "var", "cache", "arduino-app-cli")
 	hash := md5.Sum([]byte(a.FullPath.String()))
-	slog.Error("Provision for %s to %s", a.FullPath.String(), paths.New(filepath.Join(cachePath, hex.EncodeToString((hash[:])), ".cache")).String())
 	return paths.New(filepath.Join(cachePath, hex.EncodeToString((hash[:])), ".cache"))
 }
 

internal/orchestrator/config/config.go

@@ -16,6 +16,7 @@
 package config
 
 import (
+	"errors"
 	"fmt"
 	"log/slog"
 	"net/url"
@@ -62,11 +63,13 @@ func NewFromEnv() (Configuration, error) {
 
 	dataDir := paths.New(os.Getenv("ARDUINO_APP_CLI__DATA_DIR"))
 	if dataDir == nil {
-		xdgHome, err := os.UserHomeDir()
-		if err != nil {
-			return Configuration{}, err
+		dataDir = paths.New("/", "usr", "share", "arduino-app-cli")
+		slog.Info("ARDUINO_APP_CLI__DATA_DIR unset, use default", slog.String("ARDUINO_APP_CLI__DATA_DIR", dataDir.String()))
+		if dataDir == nil {
+			return Configuration{}, errors.New("unable to create data dir")
 		}
-		dataDir = paths.New(xdgHome).Join(".local", "share", "arduino-app-cli")
+	} else {
+		slog.Info("ARDUINO_APP_CLI__DATA_DIR override", slog.String("ARDUINO_APP_CLI__DATA_DIR", dataDir.String()))
 	}
 
 	routerSocket := paths.New(os.Getenv("ARDUINO_ROUTER_SOCKET"))