improve layout

utils/filename.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"regexp"
+	"runtime"
 	"strings"
 
 	"github.com/d-fi/GoFi/logger"
@@ -12,7 +13,7 @@ func SanitizeFileName(name string) string {
 	logger.Debug("Sanitizing file name: %s", name)
 
 	// Define a regex to match invalid characters
-	reg := regexp.MustCompile(`[<>:"/\\|?*\x00-\x1F]`)
+	reg := regexp.MustCompile(`[\/\?<>\\:\*\|"\x00-\x1F]`)
 
 	// Replace invalid characters with underscores
 	safeName := reg.ReplaceAllString(name, "_")
@@ -22,5 +23,11 @@ func SanitizeFileName(name string) string {
 	safeName = strings.Trim(safeName, ". ")
 	logger.Debug("Trimmed leading and trailing periods and spaces: %s", safeName)
 
+	// On Windows, filenames cannot end with a period
+	if strings.HasSuffix(safeName, ".") && strings.ToLower(runtime.GOOS) == "windows" {
+		safeName = safeName[:len(safeName)-1] + "_"
+		logger.Debug("Adjusted filename for Windows: %s", safeName)
+	}
+
 	return safeName
 }

utils/layout.go

@@ -62,12 +62,6 @@ func SaveLayout(props SaveLayoutProps) string {
 		}
 	}
 
-	// Use relative path if it starts with '{'
-	if strings.HasPrefix(props.Path, "{") {
-		props.Path = "./" + props.Path
-		logger.Debug("Updated path to be relative: %s", props.Path)
-	}
-
 	// Find keys inside {}
 	re := regexp.MustCompile(`\{([^}]*)\}`)
 	matches := re.FindAllStringSubmatch(props.Path, -1)
@@ -87,7 +81,7 @@ func SaveLayout(props SaveLayoutProps) string {
 			value = ""
 		}
 
-		if key == "TRACK_NUMBER" || key == "TRACK_POSITION" || key == "NO_TRACK_NUMBER" {
+		if key == "TRACK_NUMBER" || key == "TRACK_POSITION" || key == "NO_TRACK_NUMBER" || strings.HasSuffix(key, "TRACK_NUMBER") || strings.HasSuffix(key, "TRACK_POSITION") {
 			if value != "" {
 				num := atoiOrZero(fmt.Sprintf("%v", value))
 				formattedNum := fmt.Sprintf("%0*d", props.MinimumIntegerDigits, num)