fixed wait time function

main.go

@@ -6,9 +6,11 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
+	"math"
 	"os"
 	"os/exec"
 	"path"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
@@ -115,37 +117,49 @@ func getTime(timeString string) (int, int) {
 	return int(hr), int(min)
 }
 
-func getNextWait(config sunsetConfig) (int, int) {
+func getNextWait(config sunsetConfig) time.Duration {
 	index := nextIndex(config)
 	now := time.Now()
 	nextHr, nextMin := getTime(config.Files[index].Time)
 
-	var diffHr int
+	// Today at the time
-	var diffMin int
+	nextTime := time.Date(now.Year(), now.Month(), now.Day(), nextHr, nextMin, 0, 0, now.Location())
 
-	// FIXME still not working
+	until := nextTime.Sub(now)
-	if now.Hour() >= nextHr && now.Minute() >= nextMin {
+
-		diffHr = 24 - (now.Hour() - nextHr)
+	if math.Floor(until.Minutes()) > 0 {
-		diffMin = 60 - (now.Minute() - nextMin)
+		return until
-	} else {
-		diffHr = nextHr - now.Hour()
-		diffMin = nextMin - now.Minute()
 	}
 
-	return diffHr, diffMin
+	// Next day the the time
+	nextTime = nextTime.AddDate(0, 0, 1)
+	return nextTime.Sub(now)
 }
 
-func block(config sunsetConfig, command string) {
+func currentImage(configPath string, config sunsetConfig) string {
+	index := currentIndex(config)
+	absFile, err := filepath.Abs(path.Join(path.Dir(configPath), config.Files[index].File))
+	if err != nil {
+		log.Panic(err)
+	}
+	return absFile
+}
+
+func block(configPath string, config sunsetConfig, command string) {
+	image := currentImage(configPath, config)
+	go runCommand(command, image)
 	for {
-		nextHr, nextMin := getNextWait(config)
+		until := getNextWait(config)
-		timer := time.NewTimer((time.Duration(nextHr) * time.Hour) + (time.Duration(nextMin) * time.Minute))
+		timer := time.NewTimer(until)
 		<-timer.C
-		go runCommand(command)
+		log.Printf("Running command: %s\n", command)
+		image := currentImage(configPath, config)
+		go runCommand(command, image)
 	}
 }
 
-func runCommand(command string) {
+func runCommand(command, image string) {
-	cmd := exec.Command("/usr/bin/env sh", "-c", command)
+	cmd := exec.Command(command, image)
 	err := cmd.Run()
 	if err != nil {
 		log.Printf("Command %s returned a non 0 code", command)
@@ -165,19 +179,17 @@ func main() {
 	if *printNextTime {
 		fmt.Printf("%s", getNextTime(conf))
 	} else if *printNextWait {
-		hr, min := getNextWait(conf)
+		unitl := getNextWait(conf)
-		fmt.Printf("%dh%dm", hr, min)
+		fmt.Printf("%s", unitl)
 
 	} else if *blockFlag {
 		if *blockCommand == "" {
 			fmt.Println("Must provide a command.")
 			os.Exit(1)
 		}
-		block(conf, *blockCommand)
+		block(*configFile, conf, *blockCommand)
 	} else {
-		index := currentIndex(conf)
+		fmt.Printf("%s", currentImage(*configFile, conf))
-		absoluteImagePath := path.Join(path.Dir(*configFile), conf.Files[index].File)
-		fmt.Printf("%s", absoluteImagePath)
 	}
 
 }