image.go

@@ -30,11 +30,6 @@ func makeDefaultImageFilters() ImageFilters {
 	}
 }
 
-func hexToHSL(string) [3]int {
-
-	return [3]int{1, 1, 1}
-}
-
 func pickRandomImage(dir string) (string, error) {
 
 	dir = config.ImagesDir + dir

slideshow.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	// "bufio"
+	"bufio"
 	"fmt"
 	"log"
 	"os/exec"
@@ -14,15 +14,14 @@ func slideshow(ch <-chan string) {
 
 	//set a flat background color based on config defaults
 	fillCmd := exec.Command("swaybg", "-c", "#232136")
-	// stdout, _ := fillCmd.StdoutPipe()
-	// scanner := bufio.NewScanner(stdout)
-	// out := make(chan string)
-	// go func() {
-	// 	for scanner.Scan() {
-	// 		fmt.Println("scanner: ", scanner.Text())
-	// 		out <- scanner.Text()
-	// 	}
-	// }()
+	stdout, _ := fillCmd.StdoutPipe()
+	scanner := bufio.NewScanner(stdout)
+	out := make(chan string)
+	go func() {
+		for scanner.Scan() {
+			out <- scanner.Text()
+		}
+	}()
 
 	ready := make(chan bool)
 	go func() {
@@ -30,8 +29,7 @@ func slideshow(ch <-chan string) {
 		if err != nil {
 			fmt.Println("could not set background color", err)
 		}
-		//NOTE: this is *very* hacky, but it is difficult to know when swaybg has initiated
-		time.Sleep(100 * time.Millisecond)
+		<-out
 		ready <- true
 		fmt.Println("bg color set!")
 		fillCmd.Wait()
@@ -40,7 +38,6 @@ func slideshow(ch <-chan string) {
 	var cmd *exec.Cmd
 	go func() {
 		for {
-			<-ready
 			newCmd := setRandomWallpaper(dir)
 			if cmd != nil {
 				err := cmd.Process.Kill()