From 449d7a1ff987e48f8304a269ae138ce0d4a7f8d1 Mon Sep 17 00:00:00 2001 From: simonkellet Date: Fri, 16 Sep 2022 21:31:03 +0100 Subject: [PATCH] i think it works okay --- assets/weather.json | 20 ++++++++++++++++++++ main.go | 3 ++- run.go | 2 +- tasks.json | 14 +++++++++++--- 4 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 assets/weather.json diff --git a/assets/weather.json b/assets/weather.json new file mode 100644 index 0000000..032f51e --- /dev/null +++ b/assets/weather.json @@ -0,0 +1,20 @@ +{ + "Tasks": + [ + { + "taskname": "Cat", + "taskdesc": "cat lol", + "interval": 1000, + "cmd": "" , + "icon": "./assets/catlol.jpg" + }, + + { + "taskname": "", + "taskdesc": "", + "interval": 36, + "cmd": "we", + "icon": "" + } + ] +} diff --git a/main.go b/main.go index 5eba09f..65f8e11 100644 --- a/main.go +++ b/main.go @@ -8,13 +8,14 @@ import ( func main() { var configFlag string - flag.StringVar(&configFlag, "c", "", "path to tasks.json") + flag.StringVar(&configFlag, "c", "", "path to .json file") flag.Parse() fmt.Printf("Reading JSON file: %s\n", configFlag) config, err := LoadConfig(configFlag) if err != nil { fmt.Fprintf(os.Stderr, "Cannot load config file: %s\n\t%s\n", configFlag, err) + os.Exit(1) } TaskRun(*config) } diff --git a/run.go b/run.go index 1ea4523..b125a56 100644 --- a/run.go +++ b/run.go @@ -17,6 +17,7 @@ func TaskRun(c Config) { for i := range c.Tasks { title := c.Tasks[i].TaskName interval := c.Tasks[i].Interval + asset := c.Tasks[i].Icon var desc string // check if desc is empty and use the cmd output, if not just get the desc @@ -25,7 +26,6 @@ func TaskRun(c Config) { } else { desc = c.Tasks[i].TaskDesc } - asset := c.Tasks[i].Icon //run the commands with go func()! wg.Add(1) diff --git a/tasks.json b/tasks.json index f8c679f..0bddf31 100644 --- a/tasks.json +++ b/tasks.json @@ -4,7 +4,7 @@ { "taskname": "Example ls | wc -l Task", "taskdesc": "", - "interval": 6, + "interval": 60, "cmd": "ls /home/simon/ | wc -l" , "icon": "" }, @@ -12,7 +12,7 @@ { "taskname": "Example with no cmd", "taskdesc": "Still Place holder", - "interval": 8, + "interval": 80, "cmd": "", "icon": "" }, @@ -20,9 +20,17 @@ { "taskname": "Example image task", "taskdesc": "cat lol", - "interval": 10, + "interval": 100, "cmd": "" , "icon": "./assets/catlol.jpg" + }, + + { + "taskname": "", + "taskdesc": "", + "interval": 3600, + "cmd": "we", + "icon": "" } ] }