fix(watch): properly handle goroutine for logging

rxri · rxri · commit 32a27dce2562 · 2025-09-17T18:31:07.000+02:00
diff --git a/spicetify.go b/spicetify.go
@@ -178,11 +178,12 @@ func main() {
 			return
 		}
 		param := commands[0]
-		if param == "block" {
+		switch param {
+		case "block":
 			cmd.BlockSpotifyUpdates(true)
-		} else if param == "unblock" {
+		case "unblock":
 			cmd.BlockSpotifyUpdates(false)
-		} else {
+		default:
 			utils.PrintError("Invalid parameter. It has to be \"block\" or \"unblock\".")
 		}
 		return
diff --git a/src/cmd/cmd.go b/src/cmd/cmd.go
@@ -193,7 +193,7 @@ func InitSetting() {
 
 	schemeSection, err := colorCfg.GetSection(schemeName)
 	if err != nil {
-		println("Err")
+		utils.PrintWarning("Color scheme '" + schemeName + "' not found; using first scheme")
 		colorSection = sections[1]
 		return
 	}
diff --git a/src/cmd/watch.go b/src/cmd/watch.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
+	"sync"
 	"time"
 
 	spotifystatus "github.com/spicetify/cli/src/status/spotify"
@@ -13,6 +14,8 @@ import (
 var (
 	debuggerURL    string
 	autoReloadFunc func()
+	watchQueue     chan func()
+	watchQueueOnce sync.Once
 )
 
 // Watch .
@@ -54,8 +57,13 @@ func Watch(liveUpdate bool) {
 					utils.Fatal(err)
 				}
 
-				refreshThemeJS()
-			}, autoReloadFunc)
+				enqueueWatchJob(func() {
+					refreshThemeJS()
+					if autoReloadFunc != nil {
+						autoReloadFunc()
+					}
+				})
+			}, nil)
 		}
 	}
 
@@ -68,8 +76,13 @@ func Watch(liveUpdate bool) {
 					utils.Fatal(err)
 				}
 
-				refreshThemeAssets()
-			}, autoReloadFunc)
+				enqueueWatchJob(func() {
+					refreshThemeAssets()
+					if autoReloadFunc != nil {
+						autoReloadFunc()
+					}
+				})
+			}, nil)
 		}
 	}
 
@@ -78,9 +91,14 @@ func Watch(liveUpdate bool) {
 			utils.Fatal(err)
 		}
 
-		InitSetting()
-		refreshThemeCSS()
-	}, autoReloadFunc)
+		enqueueWatchJob(func() {
+			InitSetting()
+			refreshThemeCSS()
+			if autoReloadFunc != nil {
+				autoReloadFunc()
+			}
+		})
+	}, nil)
 }
 
 // WatchExtensions .
@@ -233,3 +251,15 @@ func startDebugger() {
 		}
 	}
 }
+
+func enqueueWatchJob(job func()) {
+	watchQueueOnce.Do(func() {
+		watchQueue = make(chan func(), 64)
+		go func() {
+			for fn := range watchQueue {
+				fn()
+			}
+		}()
+	})
+	watchQueue <- job
+}

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ func InitSetting() {`
`193`	`193`
`194`	`194`	`schemeSection, err := colorCfg.GetSection(schemeName)`
`195`	`195`	`if err != nil {`
`196`		`- println("Err")`
	`196`	`+ utils.PrintWarning("Color scheme '" + schemeName + "' not found; using first scheme")`
`197`	`197`	`colorSection = sections[1]`
`198`	`198`	`return`
`199`	`199`	`}`