rudimentary slideshow functionality

config.go

@@ -9,6 +9,7 @@ import (
 type Config struct {
 	ImageFilters
 	Root     string
+	Duration int
 }
 
 func (config *Config) load() {

config.json

@@ -3,5 +3,6 @@
 "colorize":[ 247,40,60 ],
 "contrast":-35,
 "gamma":0.8,
-"root":"/home/andrzej/bgs"
+"root":"/home/andrzej/bgs",
+"duration":10
 }

files.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"math/rand"
 	"os"
 	"regexp"
@@ -12,25 +13,24 @@ func getRandomFile(dir string) (path string, filename string, error error) {
 		return "", "", err
 	}
 
-	// for _, file := range files { fmt.Println(file.Name(), file.IsDir())
-	// }
-
 	var randomIndex int
 	var randomImg os.DirEntry
 	for {
 		randomIndex = rand.Intn(len(files))
 		randomImg = files[randomIndex]
 		//re-roll if you get a directory
-		if files[randomIndex].IsDir() == false {
+		if files[randomIndex].IsDir() {
-			break
+			fmt.Printf("%v is a directory\n", randomImg.Name())
+			continue
 		}
 		//re-roll if not a recognised image type
 		isImage, _ := regexp.Match(".jpg$|.jpeg$|.png$|.bmp$|.webp$", []byte(randomImg.Name()))
-		if isImage {
+		if !isImage {
-			break
+			fmt.Printf("%v is not a recognised image format\n", randomImg.Name())
-		}
+			continue
 		}
 		return dir + "/" + randomImg.Name(), randomImg.Name(), nil
+	}
 }
 
 func fileExistsInCache(filename string) (bool, error) {

image.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"image"
 	"log"
 	"os"
@@ -38,6 +39,7 @@ func pickRandomImage(dir string) (string, error) {
 	curr := wd + "/images/" + filenameNoExt
 	if !fileExists {
 		img, err := loadImage(randomImg)
+		fmt.Printf("failed to load image %v", randomImg)
 		if err != nil {
 			return "", err
 		}
@@ -52,6 +54,7 @@ func pickRandomImage(dir string) (string, error) {
 func loadImage(filename string) (image.Image, error) {
 	f, err := os.Open(filename)
 	if err != nil {
+
 		return nil, err
 	}
 	defer f.Close()

main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"log"
+	// "log"
 	"os"
 	"sync"
 )
@@ -10,25 +10,24 @@ import (
 var config Config
 
 func main() {
-	var err error
 
 	config.load()
 	fmt.Printf("%+v\n", config)
 
-	args := []string{""}
+	//TODO: make this logic interface more neatly with the slideshow channel
-	if len(os.Args) > 0 {
+	var dir string
-		args = os.Args[1:]
+	args := os.Args[1:]
+	if len(args) > 0 {
+		dir = args[0]
+	} else {
+		dir = ""
 	}
 
-	curr, err := pickRandomImage(args[0])
-	if err != nil {
-		log.Fatal("failed to pick image!", err)
-	}
-
-	hyprpaperSet(curr)
-
 	var waitGroup sync.WaitGroup
 	waitGroup.Add(1)
-	go server(&waitGroup)
+	slideshowDir := make(chan string)
+	go server(slideshowDir)
+	go slideshow(slideshowDir)
+	slideshowDir <- dir
 	waitGroup.Wait()
 }

server.go

@@ -6,11 +6,10 @@ import (
 	"os"
 	"os/signal"
 	"strings"
-	"sync"
 	"syscall"
 )
 
-func server(waitGroup *sync.WaitGroup) {
+func server(slideshowDir chan string) {
 
 	sockfile := "/tmp/bg-go.sock"
 	//Create a Unix domain socket and listen for incoming connections.
@@ -18,6 +17,7 @@ func server(waitGroup *sync.WaitGroup) {
 	if err != nil {
 		panic(err)
 	}
+	log.Println("listening on unix domain socket...")
 
 	//cleanup sockfile
 	//TODO: this only works when the program is killed from outside. Make it work via defer() too?
@@ -51,17 +51,13 @@ func server(waitGroup *sync.WaitGroup) {
 			}
 
 			str := strings.TrimSpace(string(buf[:n]))
-			newbg, err := pickRandomImage(str)
+			slideshowDir <- str
-			if err != nil {
+			// newbg, err := pickRandomImage(str)
-				panic(err)
-			}
-			hyprpaperSet(newbg)
-
-			// // Echo the data back to the connection
-			// _, err = conn.Write(buf[:n])
 			// if err != nil {
-			// 	log.Fatal(err)
+			// 	panic(err)
 			// }
+			// hyprpaperSet(newbg)
+
 		}(conn)
 	}
 

slideshow.go

@@ -1,5 +1,27 @@
 package main
 
-func slideshow(dir string) {
+import (
+	"log"
+	"time"
+)
 
+func slideshow(ch <-chan string) {
+	dir := <-ch
+	ticker := time.NewTicker(time.Duration(config.Duration) * time.Minute)
+	go func() {
+		for {
+			img, err := pickRandomImage(dir)
+			if err != nil {
+				panic(err)
+			}
+			hyprpaperSet(img)
+			select {
+			case dir = <-ch:
+				log.Println("directory set!")
+				continue
+			case <-ticker.C:
+				continue
+			}
+		}
+	}()
 }