Fix media dirs (#3659)

Author: timmo001

backend/http/media.go

@@ -10,7 +10,9 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/timmo001/system-bridge/settings"
 	"github.com/timmo001/system-bridge/utils"
+	"github.com/timmo001/system-bridge/utils/handlers/filesystem"
 )
 
 // ServeMediaFileDataHandler handles requests to serve media files from predefined base directories
@@ -167,28 +169,65 @@ func getBaseDirectoryPath(base string) (string, error) {
 	var basePath string
 	var err error
 
+	// First check hardcoded standard directories (for backward compatibility)
 	switch base {
 	case "documents":
 		basePath, err = getDocumentsPath()
+		if err == nil {
+			return basePath, nil
+		}
 	case "downloads":
 		basePath, err = getDownloadsPath()
+		if err == nil {
+			return basePath, nil
+		}
 	case "home":
 		basePath, err = getHomePath()
+		if err == nil {
+			return basePath, nil
+		}
 	case "music":
 		basePath, err = getMusicPath()
+		if err == nil {
+			return basePath, nil
+		}
 	case "pictures":
 		basePath, err = getPicturesPath()
+		if err == nil {
+			return basePath, nil
+		}
 	case "videos":
 		basePath, err = getVideosPath()
-	default:
-		return "", fmt.Errorf("invalid base directory: %s", base)
+		if err == nil {
+			return basePath, nil
+		}
 	}
 
-	if err != nil {
-		return "", fmt.Errorf("failed to get %s path: %w", base, err)
+	// If not found in hardcoded list, check user directories (XDG + custom)
+	directories := filesystem.GetUserDirectories()
+	for _, dir := range directories {
+		if dir.Key == base {
+			if dir.Path == "" {
+				return "", fmt.Errorf("directory %s has empty path", base)
+			}
+			return dir.Path, nil
+		}
+	}
+
+	// Also check custom media directories from settings
+	s, err := settings.Load()
+	if err == nil {
+		for _, directory := range s.Media.Directories {
+			if directory.Name == base {
+				if directory.Path == "" {
+					return "", fmt.Errorf("directory %s has empty path", base)
+				}
+				return directory.Path, nil
+			}
+		}
 	}
 
-	return basePath, nil
+	return "", fmt.Errorf("invalid base directory: %s", base)
 }
 
 // getContentType returns the MIME content type for a file based on its extension

event/handler/get-files.go

@@ -55,6 +55,17 @@ func RegisterGetFilesHandler(router *event.MessageRouter) {
 			}
 		}
 
+		// Validate base directory path is not empty
+		if baseDirectory.Path == "" {
+			slog.Error("Base directory path is empty", "base", data.BaseDirectory)
+			return event.MessageResponse{
+				ID:      message.ID,
+				Type:    event.ResponseTypeError,
+				Subtype: event.ResponseSubtypeBadDirectory,
+				Message: "Base directory path is empty",
+			}
+		}
+
 		// Get files
 		var files []GetFileResponseData
 		if data.Path != "" {

utils/handlers/filesystem/filesystem_linux.go

@@ -32,22 +32,32 @@ func getUserDirectories() []DirectoryInfo {
 					parts := strings.SplitN(line, "=", 2)
 					if len(parts) == 2 {
 						key := strings.ToLower(strings.TrimPrefix(parts[0], "XDG_"))
-						key = strings.TrimSuffix(key, "_DIR")
+						key = strings.TrimSuffix(key, "_dir")
+						// Normalize XDG key names to match expected convention across platforms
+						// XDG uses "DOWNLOAD_DIR" (singular) but codebase expects "downloads" (plural)
+						if key == "download" {
+							key = "downloads"
+						}
 						path := strings.Trim(parts[1], "\"")
 						path = strings.ReplaceAll(path, "$HOME", homeDir)
 						dirs[key] = path
 					}
 				}
 			}
 
-			return []DirectoryInfo{
-				{Key: "desktop", Path: dirs["desktop"]},
-				{Key: "documents", Path: dirs["documents"]},
-				{Key: "downloads", Path: dirs["download"]},
-				{Key: "music", Path: dirs["music"]},
-				{Key: "pictures", Path: dirs["pictures"]},
-				{Key: "videos", Path: dirs["videos"]},
+			// Build DirectoryInfo list from all parsed XDG directories
+			userDirs := make([]DirectoryInfo, 0, len(dirs))
+			for key, path := range dirs {
+				// Only include directories with non-empty paths
+				if path != "" {
+					userDirs = append(userDirs, DirectoryInfo{
+						Key:  key,
+						Path: path,
+					})
+				}
 			}
+
+			return userDirs
 		}
 	}