From 84ecf296a537f668c29ff72b3790c33ca14b26d4 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Fri, 13 Apr 2018 16:14:57 -0700 Subject: [PATCH] RefreshedAt moved to the end of the refresh (because that makes more sense, doesn't it?) --- bamboohr/widget.go | 3 ++- docs/_config.yml | 1 - gcal/widget.go | 6 +++--- git/widget.go | 3 ++- github/widget.go | 3 ++- jira/widget.go | 4 ++-- newrelic/widget.go | 3 ++- opsgenie/widget.go | 3 ++- security/widget.go | 4 ++-- status/widget.go | 4 ++-- weather/widget.go | 3 ++- wtf/config_watcher.rb | 13 +++++++++++++ 12 files changed, 34 insertions(+), 16 deletions(-) delete mode 100644 docs/_config.yml create mode 100644 wtf/config_watcher.rb diff --git a/bamboohr/widget.go b/bamboohr/widget.go index e1aa3d31..bf60dab1 100644 --- a/bamboohr/widget.go +++ b/bamboohr/widget.go @@ -43,10 +43,11 @@ func (widget *Widget) Refresh() { ) widget.View.SetTitle(fmt.Sprintf(" 👽 Away (%d) ", len(todayItems))) - widget.RefreshedAt = time.Now() widget.View.Clear() fmt.Fprintf(widget.View, "%s", widget.contentFrom(todayItems)) + + widget.RefreshedAt = time.Now() } /* -------------------- Unexported Functions -------------------- */ diff --git a/docs/_config.yml b/docs/_config.yml deleted file mode 100644 index 259a24e4..00000000 --- a/docs/_config.yml +++ /dev/null @@ -1 +0,0 @@ -theme: jekyll-theme-tactile \ No newline at end of file diff --git a/gcal/widget.go b/gcal/widget.go index d94a0fd6..768bfbe6 100644 --- a/gcal/widget.go +++ b/gcal/widget.go @@ -37,10 +37,10 @@ func (widget *Widget) Refresh() { events, _ := Fetch() - widget.RefreshedAt = time.Now() - widget.View.Clear() fmt.Fprintf(widget.View, "%s", widget.contentFrom(events)) + + widget.RefreshedAt = time.Now() } /* -------------------- Unexported Functions -------------------- */ @@ -207,5 +207,5 @@ func (widget *Widget) until(event *calendar.Event) string { untilStr = fmt.Sprintf("%dm", mins) } - return "[grey]" + untilStr + "[white]" + return "[lightblue]" + untilStr + "[white]" } diff --git a/git/widget.go b/git/widget.go index 4bf51f91..073bf362 100644 --- a/git/widget.go +++ b/git/widget.go @@ -40,10 +40,11 @@ func (widget *Widget) Refresh() { title := fmt.Sprintf("[green]%s[white]\n", data["repo"][0]) widget.View.SetTitle(fmt.Sprintf(" Git: %s ", title)) - widget.RefreshedAt = time.Now() widget.View.Clear() fmt.Fprintf(widget.View, "%s", widget.contentFrom(data)) + + widget.RefreshedAt = time.Now() } /* -------------------- Unexported Functions -------------------- */ diff --git a/github/widget.go b/github/widget.go index 6aea56e9..23a3a06a 100644 --- a/github/widget.go +++ b/github/widget.go @@ -38,7 +38,6 @@ func (widget *Widget) Refresh() { prs, _ := client.PullRequests(Config.UString("wtf.mods.github.owner"), Config.UString("wtf.mods.github.repo")) widget.View.SetTitle(fmt.Sprintf(" Github: %s ", widget.title())) - widget.RefreshedAt = time.Now() str := " [red]Open Review Requests[white]\n" str = str + widget.prsForReview(prs, Config.UString("wtf.mods.github.username")) @@ -48,6 +47,8 @@ func (widget *Widget) Refresh() { widget.View.Clear() fmt.Fprintf(widget.View, str) + + widget.RefreshedAt = time.Now() } /* -------------------- Unexported Functions -------------------- */ diff --git a/jira/widget.go b/jira/widget.go index fb487893..8abe65d1 100644 --- a/jira/widget.go +++ b/jira/widget.go @@ -35,8 +35,6 @@ func (widget *Widget) Refresh() { searchResult, err := IssuesFor(Config.UString("wtf.mods.jira.username")) - widget.RefreshedAt = time.Now() - widget.View.Clear() if err != nil { @@ -54,6 +52,8 @@ func (widget *Widget) Refresh() { ) fmt.Fprintf(widget.View, "%s", widget.contentFrom(searchResult)) } + + widget.RefreshedAt = time.Now() } /* -------------------- Unexported Functions -------------------- */ diff --git a/newrelic/widget.go b/newrelic/widget.go index 58007e9e..2a1bce1c 100644 --- a/newrelic/widget.go +++ b/newrelic/widget.go @@ -43,7 +43,6 @@ func (widget *Widget) Refresh() { } widget.View.SetTitle(fmt.Sprintf(" New Relic: [green]%s[white] ", appName)) - widget.RefreshedAt = time.Now() widget.View.Clear() @@ -54,6 +53,8 @@ func (widget *Widget) Refresh() { widget.View.SetWrap(false) fmt.Fprintf(widget.View, "%s", widget.contentFrom(deploys)) } + + widget.RefreshedAt = time.Now() } /* -------------------- Unexported Functions -------------------- */ diff --git a/opsgenie/widget.go b/opsgenie/widget.go index ae021668..051518bf 100644 --- a/opsgenie/widget.go +++ b/opsgenie/widget.go @@ -37,7 +37,6 @@ func (widget *Widget) Refresh() { data, err := Fetch() widget.View.SetTitle(" ⏰ On Call ") - widget.RefreshedAt = time.Now() widget.View.Clear() @@ -48,6 +47,8 @@ func (widget *Widget) Refresh() { widget.View.SetWrap(false) fmt.Fprintf(widget.View, "%s", widget.contentFrom(data)) } + + widget.RefreshedAt = time.Now() } /* -------------------- Unexported Functions -------------------- */ diff --git a/security/widget.go b/security/widget.go index d203f903..69d1fe10 100644 --- a/security/widget.go +++ b/security/widget.go @@ -36,10 +36,10 @@ func (widget *Widget) Refresh() { data := NewSecurityData() data.Fetch() - widget.RefreshedAt = time.Now() - widget.View.Clear() fmt.Fprintf(widget.View, "%s", widget.contentFrom(data)) + + widget.RefreshedAt = time.Now() } /* -------------------- Unexported Functions -------------------- */ diff --git a/status/widget.go b/status/widget.go index ba056c95..a526b456 100644 --- a/status/widget.go +++ b/status/widget.go @@ -37,8 +37,6 @@ func (widget *Widget) Refresh() { return } - widget.RefreshedAt = time.Now() - _, _, w, _ := widget.View.GetInnerRect() widget.View.Clear() @@ -48,6 +46,8 @@ func (widget *Widget) Refresh() { widget.animation(), widget.timezones(), ) + + widget.RefreshedAt = time.Now() } /* -------------------- Unexported Functions -------------------- */ diff --git a/weather/widget.go b/weather/widget.go index 457ff074..107794d8 100644 --- a/weather/widget.go +++ b/weather/widget.go @@ -38,10 +38,11 @@ func (widget *Widget) Refresh() { data := Fetch(Config.UInt("wtf.mods.weather.cityId", 6176823)) widget.View.SetTitle(fmt.Sprintf(" %s %s ", icon(data), data.Name)) - widget.RefreshedAt = time.Now() widget.View.Clear() fmt.Fprintf(widget.View, "%s", widget.contentFrom(data)) + + widget.RefreshedAt = time.Now() } /* -------------------- Unexported Functions -------------------- */ diff --git a/wtf/config_watcher.rb b/wtf/config_watcher.rb new file mode 100644 index 00000000..d9d32412 --- /dev/null +++ b/wtf/config_watcher.rb @@ -0,0 +1,13 @@ +package wtf + +import( +"time" +) + +type ConfigWatcher struct { + UpdatedAt *time.Time +} + +func (watcher *ConfigWatcher) Watch() { + +}