fix(macOS): Rate-limit UI tuning loop and revert double-buffering (#139)

Author: dixieflatline76

pkg/curation/zz_generated_provider_map.go

@@ -6,8 +6,6 @@ import (
 	"math/rand"
 	"os"
 	"path/filepath"
-	"runtime"
-	"strings"
 	"sync"
 	"time"
 
@@ -546,27 +544,6 @@ func (mc *MonitorController) applyImage(img provider.Image) {
 	}
 }
 
-// nextDerivativePath returns the next file path for the double buffering system on macOS.
-// For non-macOS systems, it returns the current path.
-func nextDerivativePath(currentPath string, targetOS string) string {
-	if targetOS != "darwin" {
-		return currentPath
-	}
-	dir := filepath.Dir(currentPath)
-	base := filepath.Base(currentPath)
-	ext := filepath.Ext(base)
-	nameWithoutExt := strings.TrimSuffix(base, ext)
-
-	if strings.HasSuffix(nameWithoutExt, "_A") {
-		nameWithoutExt = strings.TrimSuffix(nameWithoutExt, "_A") + "_B"
-	} else if strings.HasSuffix(nameWithoutExt, "_B") {
-		nameWithoutExt = strings.TrimSuffix(nameWithoutExt, "_B") + "_A"
-	} else {
-		nameWithoutExt = nameWithoutExt + "_A"
-	}
-	return filepath.Join(dir, nameWithoutExt+ext)
-}
-
 // reprocessWithTuning updates the tuning options on the current image, re-runs FitImage,
 // and sets the resulting derivative as the wallpaper.
 func (mc *MonitorController) reprocessWithTuning(opts provider.TuningOptions) {
@@ -622,14 +599,28 @@ func (mc *MonitorController) reprocessWithTuning(opts provider.TuningOptions) {
 	// 4. Re-run FitImage with new tuning
 	width, height := mc.Monitor.Rect.Dx(), mc.Monitor.Rect.Dy()
 	ctx := context.Background()
+	virtualFramed := false
+	ctx = context.WithValue(ctx, provider.VirtualFramedKey, &virtualFramed)
+
 	processedImg, err := mc.processor.FitImage(ctx, srcImg, width, height, opts)
 	if err != nil {
 		log.Printf("[ERROR] [Monitor %d] FitImage failed with tuning %v: %v", mc.ID, opts, err)
 		return
 	}
 
-	// 5. Determine derivative path and overwrite
 	resKey = fmt.Sprintf("%dx%d", width, height)
+
+	// Keep the UI sync state fresh by tracking if VirtualFramer actually framed it
+	if img.ProcessingFlags == nil {
+		img.ProcessingFlags = make(map[string]bool)
+	}
+	if virtualFramed {
+		img.ProcessingFlags["VirtualFramed:"+resKey] = true
+	} else {
+		delete(img.ProcessingFlags, "VirtualFramed:"+resKey)
+	}
+
+	// 5. Determine derivative path and overwrite
 	derivPath := ""
 	if p, ok := img.DerivativePaths[resKey]; ok {
 		derivPath = p
@@ -645,33 +636,18 @@ func (mc *MonitorController) reprocessWithTuning(opts provider.TuningOptions) {
 	// inode. On macOS/APFS, imaging.Save → os.Create truncates in-place (same
 	// inode), and the OS serves stale cached image data. Deleting first ensures
 	// os.Create allocates a new inode, bypassing all file-level caching.
-	newDerivPath := nextDerivativePath(derivPath, runtime.GOOS)
+	os.Remove(derivPath) // Ignore error — file may not exist yet
 
-	if err := imaging.Save(processedImg, newDerivPath); err != nil {
+	if err := imaging.Save(processedImg, derivPath); err != nil {
 		log.Printf("[ERROR] [Monitor %d] Failed to save derivative: %v", mc.ID, err)
 		return
 	}
-
-	if newDerivPath != derivPath {
-		// Safely clean up the old buffer file after successful save
-		os.Remove(derivPath)
-
-		// Update in-memory state and persistent store with new path
-		if img.DerivativePaths == nil {
-			img.DerivativePaths = make(map[string]string)
-		}
-		img.DerivativePaths[resKey] = newDerivPath
-		mc.State.CurrentImage = img
-		mc.Store.SetDerivativePath(img.ID, resKey, newDerivPath)
-	} else {
-		// Standard modification time bump for other OSes (if needed by their cache)
-		now := time.Now()
-		_ = os.Chtimes(newDerivPath, now, now)
-	}
+	now := time.Now()
+	_ = os.Chtimes(derivPath, now, now)
 
 	// 6. Set wallpaper
 	mc.State.CurrentImage = img
-	if err := mc.os.SetWallpaper(newDerivPath, mc.ID); err != nil {
+	if err := mc.os.SetWallpaper(derivPath, mc.ID); err != nil {
 		log.Printf("[ERROR] [Monitor %d] Failed to set wallpaper: %v", mc.ID, err)
 	}
 

pkg/wallpaper/double_buffer_test.go

@@ -108,6 +108,7 @@ func (wp *Plugin) showTuneImagePopup(monitorID int) {
 					}
 				}
 
+				start := time.Now()
 				wp.SetTuningOptions(monitorID, opts)
 
 				// Wait for completion (with timeout to prevent hanging)
@@ -117,6 +118,13 @@ func (wp *Plugin) showTuneImagePopup(monitorID int) {
 					log.Printf("[WARN] Tuning reprocessing timed out for monitor %d", monitorID)
 				}
 
+				// Enforce a minimum delay to prevent macOS wallpaper daemon choke and UI spam
+				// macOS NSWorkspace can drop or queue transitions if called too rapidly.
+				elapsed := time.Since(start)
+				if elapsed < 500*time.Millisecond {
+					time.Sleep(500*time.Millisecond - elapsed)
+				}
+
 				if onDone != nil {
 					onDone()
 				}