From f6e7a2c030973b1e77bcb04dfd7498818947c337 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Sat, 31 Mar 2018 20:04:09 -0700 Subject: [PATCH] WIP Git widget --- bamboohr/widget.go | 1 + gcal/widget.go | 1 + git/widget.go | 75 ++++++++++++++++++++++++++++++++++++++++++++++ security/widget.go | 1 - weather/widget.go | 2 ++ wtf.go | 5 ++++ 6 files changed, 84 insertions(+), 1 deletion(-) diff --git a/bamboohr/widget.go b/bamboohr/widget.go index 2133fc50..0e9ffed9 100644 --- a/bamboohr/widget.go +++ b/bamboohr/widget.go @@ -36,6 +36,7 @@ func (widget *Widget) Refresh() { widget.View.SetTitle(fmt.Sprintf(" 👽 Away (%d) ", len(items))) widget.RefreshedAt = time.Now() + widget.View.Clear() fmt.Fprintf(widget.View, "%s", widget.contentFrom(items)) } diff --git a/gcal/widget.go b/gcal/widget.go index 0bf5b7c5..3c4c3c79 100644 --- a/gcal/widget.go +++ b/gcal/widget.go @@ -38,6 +38,7 @@ func (widget *Widget) Refresh() { widget.View.SetTitle(" 🍿 Calendar ") widget.RefreshedAt = time.Now() + widget.View.Clear() fmt.Fprintf(widget.View, "%s", widget.contentFrom(events)) } diff --git a/git/widget.go b/git/widget.go index e69de29b..63b7b125 100644 --- a/git/widget.go +++ b/git/widget.go @@ -0,0 +1,75 @@ +package git + +import ( + //"fmt" + "time" + + "github.com/rivo/tview" + "github.com/senorprogrammer/wtf/wtf" +) + +type Widget struct { + wtf.BaseWidget + View *tview.TextView +} + +func NewWidget() *Widget { + widget := Widget{ + BaseWidget: wtf.BaseWidget{ + Name: "Git", + RefreshedAt: time.Now(), + RefreshInterval: 10, + }, + } + + widget.addView() + go widget.refresher() + + return &widget +} + +/* -------------------- Exported Functions -------------------- */ + +func (widget *Widget) Refresh() { + //data := Fetch() + + widget.View.SetTitle(" 🙈 Git ") + widget.RefreshedAt = time.Now() + + widget.View.Clear() + //fmt.Fprintf(widget.View, "%s", widget.contentFrom(data)) +} + +/* -------------------- Unexported Functions -------------------- */ + +func (widget *Widget) addView() { + view := tview.NewTextView() + + view.SetBorder(true) + view.SetDynamicColors(true) + view.SetTitle(widget.Name) + + widget.View = view +} + +func (widget *Widget) contentFrom(data map[string]string) string { + str := "\n" + str = str + "This is git" + + return str +} + +func (widget *Widget) refresher() { + tick := time.NewTicker(time.Duration(widget.RefreshInterval) * time.Minute) + quit := make(chan struct{}) + + for { + select { + case <-tick.C: + widget.Refresh() + case <-quit: + tick.Stop() + return + } + } +} diff --git a/security/widget.go b/security/widget.go index 52fc960a..bcf4a839 100644 --- a/security/widget.go +++ b/security/widget.go @@ -38,7 +38,6 @@ func (widget *Widget) Refresh() { widget.RefreshedAt = time.Now() widget.View.Clear() - fmt.Fprintf(widget.View, "%s", widget.contentFrom(data)) } diff --git a/weather/widget.go b/weather/widget.go index 0b843a6d..00c70f44 100644 --- a/weather/widget.go +++ b/weather/widget.go @@ -95,6 +95,8 @@ func icon(data *owm.CurrentWeatherData) string { icon = "🌤" case "fog": icon = "🌫" + case "haze": + icon = "🌫" case "heavy rain": icon = "💦" case "heavy snow": diff --git a/wtf.go b/wtf.go index bcf4564d..1611724e 100644 --- a/wtf.go +++ b/wtf.go @@ -6,6 +6,7 @@ import ( "github.com/rivo/tview" "github.com/senorprogrammer/wtf/bamboohr" "github.com/senorprogrammer/wtf/gcal" + "github.com/senorprogrammer/wtf/git" "github.com/senorprogrammer/wtf/security" "github.com/senorprogrammer/wtf/status" "github.com/senorprogrammer/wtf/weather" @@ -33,6 +34,9 @@ func main() { cal := gcal.NewWidget() cal.Refresh() + git := git.NewWidget() + git.Refresh() + sec := security.NewWidget() sec.Refresh() @@ -49,6 +53,7 @@ func main() { grid.AddItem(bamboo.View, 0, 0, 2, 1, 0, 0, false) grid.AddItem(cal.View, 2, 0, 1, 1, 0, 0, false) + grid.AddItem(git.View, 0, 2, 3, 1, 0, 0, false) grid.AddItem(stat.View, 3, 0, 2, 3, 0, 0, false) grid.AddItem(weather.View, 0, 1, 1, 1, 0, 0, false) grid.AddItem(sec.View, 1, 1, 1, 1, 0, 0, false)