From feb0dfc20171ba5f0fe2b7defc3452744dd9e2d0 Mon Sep 17 00:00:00 2001 From: Jackson Taylor Date: Sat, 11 Apr 2020 12:10:32 -0400 Subject: Change where loop occurs Move the main program loop to main.go instead of in the bar itself --- bar.go | 3 +-- main.go | 24 +++++------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/bar.go b/bar.go index 5974ff4..159de50 100644 --- a/bar.go +++ b/bar.go @@ -13,8 +13,7 @@ func (b Bar) Display() string { for _, mod := range b.Modules { s, _ := mod.GetInfo() - val += s - time.Sleep(b.RefreshRate) + val += "[" + s + "]" } return val diff --git a/main.go b/main.go index ef2df15..459cb8e 100644 --- a/main.go +++ b/main.go @@ -8,11 +8,11 @@ package main import ( "fmt" - // "os" "os/exec" "time" ) +// Module is the interface for you to extend what your bar does. type Module interface { GetInfo() (string, error) } @@ -30,28 +30,14 @@ func main() { } fmt.Println("Bar Started") - var value string - for { - value = "" - for _, b := range main.Modules { - p1, err := b.GetInfo() - if err != nil { - fmt.Println(err) - continue - } - value += "[" + p1 + "]" - } - - setBar(value) + display(main.Display()) + time.Sleep(main.RefreshRate) + fmt.Println("Updating bar") } } -func getBattery() string { - return "100 %" -} - -func setBar(value string) (err error) { +func display(value string) (err error) { err = exec.Command("xsetroot", "-name", value).Run() return err } -- cgit v1.2.3