added assets folder

README.md

@@ -1,5 +1,7 @@
 # Go Task Reminder
+
 ***unfinished***
+
 ## The Goal
 
 Create a **Task Reminder** application that will:
@@ -17,11 +19,32 @@ Of course, handle all the errors that are involved with this:
 The JSON structure should look like this:
 
 ```json
+{
+    "Tasks":
+    [
+        {
+        "taskname": "Example Task",
+        "taskdesc": "",
+        "interval": 100,
+        "cmd": "ls | wc -l" ,
+        "icon": ""
+        },
 
+        {
+        "taskname": "Second Example",
+        "taskdesc": "catlol",
+        "interval": 15,
+        "cmd": "",
+        "icon": "./assets/catlol.jpg"
+        }
+    ]
+}
 ```
 
-This file can be placed in either:
+## TODO
-* /home/user/.config/rem/tasks.json
+* Create sample config
-* /home/user/go/src/rem/tasks.json
+* check these two locations for a config:
-  
+    * /home/user/.config/rem/tasks.json
+    * /home/user/go/src/rem/tasks.json
+* More!
 

main.go

@@ -16,8 +16,5 @@ func main() {
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Cannot load config file: %s\n\t%s\n", configFlag, err)
 	}
-
 	TaskRun(*config)
-	//exampleoutput := TaskCMD(*config)
-	//fmt.Printf("%s", exampleoutput)
 }

run.go

@@ -4,39 +4,58 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"sync"
+	"time"
 
 	"github.com/gen2brain/beeep"
 )
 
 // Run will take the config file and for each task, run a go routine
 func TaskRun(c Config) {
+	var wg sync.WaitGroup
+
 	for i := range c.Tasks {
 		title := c.Tasks[i].TaskName
-		desc := c.Tasks[i].TaskDesc
+		interval := c.Tasks[i].Interval
-		err := beeep.Notify(title, desc, "")
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "ERROR: could not display \"%s\":\n\t%s\n", title, err)
-		}
-	}
 
+		var desc string
+		// check if desc is empty and use the cmd output, if not just get the desc
+		if c.Tasks[i].TaskDesc == "" {
+			desc = TaskCMD(c.Tasks[i])
+		} else {
+			desc = c.Tasks[i].TaskDesc
+		}
+		asset := c.Tasks[i].Icon
+
+		//run the commands with go func()!
+		wg.Add(1)
+		go func() {
+			fmt.Printf("%s has time interval %d\n", title, interval)
+			for range time.Tick(time.Second * interval) {
+				err := beeep.Notify(title, desc, asset)
+				if err != nil {
+					fmt.Fprintf(os.Stderr, "ERROR: could not display \"%s\":\n\t%s\n", title, err)
+				}
+			}
+
+			wg.Done()
+		}()
+	}
+	wg.Wait()
 }
 
-// TaskCMD will take the config struct and run all the "CMD" fields with "bash -c [command]" and return the output
+// TaskCMD will take in a Task, run the command with bash and return the string output
-func TaskCMD(c Config) (output string) {
+func TaskCMD(t Task) (output string) {
-	for i := range c.Tasks {
+	command := t.CMD
-		command := c.Tasks[i].CMD
 
-		if command == " " {
+	if command == " " {
-			fmt.Printf("INFO: Task %s has the cmd section empty. Will just return...\n", c.Tasks[i].TaskName)
+		fmt.Printf("INFO: Task %s has the cmd section empty. Will just return...\n", t.TaskName)
-			return
+		return
-		}
-
-		out, err := exec.Command("bash", "-c", command).Output()
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "ERROR: could not run command \"%s\":\n\t%s\n", command, err)
-		}
-		//fmt.Printf("Output:\n%s\n", out)
-		return string(out)
 	}
-	return
+
+	out, err := exec.Command("bash", "-c", command).Output()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "ERROR: could not run command \"%s\":\n\t%s\n", command, err)
+	}
+	return string(out)
 }

tasks.go

@@ -1,11 +1,13 @@
 package main
 
+import "time"
+
 // TODO: Finish off doc. here
 
 type Task struct {
-	TaskName string `json:"taskname"`
+	TaskName string        `json:"taskname"`
-	TaskDesc string `json:"taskdesc"`
+	TaskDesc string        `json:"taskdesc"`
-	Interval int32  `json:"interval"`
+	Interval time.Duration `json:"interval"`
-	CMD      string `json:"cmd"`
+	CMD      string        `json:"cmd"`
-	Icon     string `json:"icon"`
+	Icon     string        `json:"icon"`
 }

tasks.json

@@ -2,19 +2,27 @@
     "Tasks":
     [
         {
-        "taskname": "Example Task",
+        "taskname": "Example ls | wc -l Task",
-        "taskdesc": "This is placeholder",
+        "taskdesc": "",
-        "interval": 100,
+        "interval": 6,
-        "cmd": "we" ,
+        "cmd": "ls /home/simon/ | wc -l" ,
-        "icon": " "
+        "icon": ""
         },
 
         {
-        "taskname": "Second Example",
+        "taskname": "Example with no cmd",
         "taskdesc": "Still Place holder",
-        "interval": -1,
+        "interval": 8,
-        "cmd": " ",
+        "cmd": "",
-        "icon": " "
+        "icon": ""
+        },
+
+        {
+        "taskname": "Example image task",
+        "taskdesc": "cat lol",
+        "interval": 10,
+        "cmd": "" ,
+        "icon": "./assets/catlol.jpg"
         }
     ]
 }