From 680a825b1f00d17a38a3b79c016b7523902531d2 Mon Sep 17 00:00:00 2001
From: Kevin Lyda <kevin@lyda.ie>
Date: Thu, 1 Dec 2022 23:55:17 +0000
Subject: [PATCH] Successfully receiving clicks.
---
bar/clicks.go | 8 +++++---
bar/run.go | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/bar/clicks.go b/bar/clicks.go
index 67ce51c..896a76b 100644
--- a/bar/clicks.go
+++ b/bar/clicks.go
@@ -24,18 +24,20 @@ func handleCommands(clicks chan modules.Click) {
if err != nil {
continue
}
- objReader := strings.NewReader(strings.Trim(object, ","))
+ object = strings.Trim(object, "[,\n")
+ logger.WriteString(fmt.Sprintf("Got an object: <<%s>>\n", object))
+ objReader := strings.NewReader(object)
clickParser := yaml.NewDecoder(objReader)
click := modules.Click{}
err = clickParser.Decode(&click)
if err != nil {
- logger.WriteString(fmt.Sprintf("Error on click: %s\n", err))
+ logger.WriteString(fmt.Sprintf("Error on click: %#v\n", err))
clicks <- modules.Click{
Name: fmt.Sprintf("ERROR: %s", err),
}
continue
}
- logger.WriteString(fmt.Sprintf("Error on click: %s\n", err))
+ logger.WriteString(fmt.Sprintf("Parsed ok click: %#v\n", click))
clicks <- click
}
}
diff --git a/bar/run.go b/bar/run.go
index 7af2830..6d653fa 100644
--- a/bar/run.go
+++ b/bar/run.go
@@ -39,11 +39,11 @@ func Run(cmd *cobra.Command, args []string) {
for _, module := range cfg.Modules {
if click.Name == module.Name {
found = true
- fmt.Print(`[{"full_text": "CLICK!"},{"name": "post", "full_text": "post", "color": "#11ff11"},{"name": "date", "full_text": "22-12-01 22:54"}]`)
+ fmt.Print(`,[{"full_text": "CLICK!"},{"name": "post", "full_text": "post", "color": "#11ff11"},{"name": "date", "full_text": "22-12-01 22:54"}]`)
}
}
if !found {
- fmt.Print(`[{"full_text": "ERROR!"},{"name": "post", "full_text": "post", "color": "#11ff11"},{"name": "date", "full_text": "22-12-01 22:54"}]`)
+ fmt.Print(`,[{"full_text": "ERROR!"},{"name": "post", "full_text": "post", "color": "#11ff11"},{"name": "date", "full_text": "22-12-01 22:54"}]`)
}
time.Sleep(5 * time.Second)
case <-time.After(time.Duration(cfg.Refresh) * time.Second):
--
GitLab