Sync dev to main

cmd/proxsave/config_helpers.go

@@ -5,6 +5,8 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/tis24dev/proxsave/pkg/utils"
 )
 
 type configStatusLogger interface {
@@ -47,27 +49,44 @@ func ensureConfigExists(path string, logger configStatusLogger) error {
 }
 
 func setEnvValue(template, key, value string) string {
-	target := key + "="
 	lines := strings.Split(template, "\n")
 	replaced := false
 	for i, line := range lines {
 		trimmed := strings.TrimSpace(line)
-		if strings.HasPrefix(trimmed, target) {
+		if utils.IsComment(trimmed) {
+			continue
+		}
+
+		parts := strings.SplitN(trimmed, "=", 2)
+		if len(parts) >= 1 && strings.TrimSpace(parts[0]) == key {
+			// Found match!
+			// We try to preserve the indentation and comments from the original line.
 			leadingLen := len(line) - len(strings.TrimLeft(line, " \t"))
 			leading := ""
 			if leadingLen > 0 {
 				leading = line[:leadingLen]
 			}
-			rest := line[leadingLen:]
-			commentSpacing := ""
+
+			// Extract comment if present in the original line logic
+			// The original logic extracted comment from 'rest' after target match.
+			// Here we can re-parse the line specifically for comment.
 			comment := ""
-			if idx := strings.Index(rest, "#"); idx >= 0 {
-				before := rest[:idx]
-				comment = rest[idx:]
-				trimmedBefore := strings.TrimRight(before, " \t")
-				commentSpacing = before[len(trimmedBefore):]
-				rest = trimmedBefore
+			commentSpacing := ""
+
+			if idx := strings.Index(line, "#"); idx >= 0 {
+				// Verify # is not part of the key or value?
+				// Assuming standard comment
+				commentPart := line[idx:]
+				// Ensure it's not inside quotes? The original logic didn't check quotes carefully but let's be safe(r).
+				// For setEnvValue we are replacing the value, so we just want to keep the comment at the end.
+				comment = commentPart
+
+				// Find spacing before comment
+				beforeComment := line[:idx]
+				trimmedBefore := strings.TrimRight(beforeComment, " \t")
+				commentSpacing = beforeComment[len(trimmedBefore):]
 			}
+
 			newLine := leading + key + "=" + value
 			if comment != "" {
 				spacing := commentSpacing
@@ -78,6 +97,9 @@ func setEnvValue(template, key, value string) string {
 			}
 			lines[i] = newLine
 			replaced = true
+			// We stop after first match? Original code didn't break, but typically keys are unique.
+			// Let's break to avoid multiple replacements if file is messy (or continue to fix all?)
+			// Original didn't break. Let's not break to match behavior.
 		}
 	}
 	if !replaced {

cmd/proxsave/main.go

@@ -334,6 +334,12 @@
 			bootstrap.Error("ERROR: Failed to plan configuration upgrade: %v", err)
 			return types.ExitConfigError.Int()
 		}
+		if len(result.Warnings) > 0 {
+			bootstrap.Warning("Config upgrade warnings (%d):", len(result.Warnings))
+			for _, warning := range result.Warnings {
+				bootstrap.Warning("  - %s", warning)
+			}
+		}
 		if !result.Changed {
 			bootstrap.Println("Configuration is already up to date with the embedded template; no changes are required.")
 			return types.ExitSuccess.Int()
@@ -437,6 +443,12 @@
 			bootstrap.Error("ERROR: Failed to upgrade configuration: %v", err)
 			return types.ExitConfigError.Int()
 		}
+		if len(result.Warnings) > 0 {
+			bootstrap.Warning("Config upgrade warnings (%d):", len(result.Warnings))
+			for _, warning := range result.Warnings {
+				bootstrap.Warning("  - %s", warning)
+			}
+		}
 		if !result.Changed {
 			bootstrap.Println("Configuration is already up to date with the embedded template; no changes were made.")
 			return types.ExitSuccess.Int()
@@ -1549,7 +1561,7 @@
 		}
 		fmt.Printf("\r  Remaining: %ds   ", int(remaining.Seconds()))
 
 		select {
 		case <-ticker.C:
 			continue
 		}

cmd/proxsave/upgrade.go

@@ -589,6 +589,14 @@ func printUpgradeFooter(upgradeErr error, version, configPath, baseDir, telegram
 		}
 	}
 
+	if cfgUpgradeResult != nil && len(cfgUpgradeResult.Warnings) > 0 {
+		fmt.Printf("Configuration warnings (%d):\n", len(cfgUpgradeResult.Warnings))
+		for _, warning := range cfgUpgradeResult.Warnings {
+			fmt.Printf("  - %s\n", warning)
+		}
+		fmt.Println()
+	}
+
 	fmt.Println("Next steps:")
 	if strings.TrimSpace(configPath) != "" {
 		fmt.Printf("1. Verify configuration: %s\n", configPath)

internal/config/config.go

@@ -1228,7 +1228,9 @@ func parseEnvFile(path string) (map[string]string, error) {
 					terminated = true
 					break
 				}
-				blockLines = append(blockLines, next)
+				if !utils.IsComment(strings.TrimSpace(next)) {
+					blockLines = append(blockLines, next)
+				}
 			}
 			if !terminated {
 				return nil, fmt.Errorf("unterminated multi-line value for %s", key)