From a48d15079a65d7c7777f8dba618379da39ef1c46 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Thu, 11 Oct 2018 17:12:29 -0400 Subject: [PATCH] Remove RefreshedAt from TextWidget This attribute is used for absolutely nothing. It doesn't need to exist. --- bamboohr/widget.go | 1 - bargraph/widget.go | 1 - circleci/widget.go | 2 -- clocks/widget.go | 1 - cmdrunner/widget.go | 1 - cryptoexchanges/bittrex/widget.go | 1 - cryptoexchanges/blockfolio/widget.go | 1 - cryptoexchanges/cryptolive/widget.go | 2 -- datadog/widget.go | 1 - gcal/widget.go | 1 - gerrit/widget.go | 1 - git/widget.go | 1 - github/widget.go | 1 - gitlab/widget.go | 1 - gitter/widget.go | 1 - gspreadsheets/widget.go | 2 -- hackernews/widget.go | 1 - ipaddresses/ipapi/widget.go | 1 - ipaddresses/ipinfo/widget.go | 1 - jenkins/widget.go | 2 -- jira/widget.go | 2 -- logger/log.go | 1 - mercurial/widget.go | 5 ++--- newrelic/widget.go | 1 - opsgenie/widget.go | 1 - power/widget.go | 1 - security/widget.go | 1 - security/widget_windows.go | 1 - spotify/widget.go | 1 - status/widget.go | 1 - system/widget.go | 2 -- todo/widget.go | 1 - todoist/widget.go | 1 - travisci/widget.go | 2 -- trello/widget.go | 1 - twitter/widget.go | 1 - weatherservices/prettyweather/widget.go | 1 - weatherservices/weather/widget.go | 1 - wtf/bargraph.go | 19 +++++++------------ wtf/text_widget.go | 12 +++--------- zendesk/widget.go | 1 - 41 files changed, 12 insertions(+), 69 deletions(-) diff --git a/bamboohr/widget.go b/bamboohr/widget.go index b7d0fbc1..662b19f4 100644 --- a/bamboohr/widget.go +++ b/bamboohr/widget.go @@ -29,7 +29,6 @@ func (widget *Widget) Refresh() { wtf.Now().Format(wtf.DateFormat), ) - widget.UpdateRefreshedAt() widget.View.SetTitle(widget.ContextualTitle(widget.Name)) widget.View.SetText(widget.contentFrom(todayItems)) diff --git a/bargraph/widget.go b/bargraph/widget.go index deabd0d9..90da9842 100644 --- a/bargraph/widget.go +++ b/bargraph/widget.go @@ -58,7 +58,6 @@ func (widget *Widget) Refresh() { return } - widget.UpdateRefreshedAt() widget.View.Clear() display(widget) diff --git a/circleci/widget.go b/circleci/widget.go index ec5d1fff..5ac21a7d 100644 --- a/circleci/widget.go +++ b/circleci/widget.go @@ -28,8 +28,6 @@ func (widget *Widget) Refresh() { builds, err := BuildsFor() - widget.UpdateRefreshedAt() - widget.View.SetTitle(fmt.Sprintf("%s - Builds", widget.Name)) var content string diff --git a/clocks/widget.go b/clocks/widget.go index ba11e60a..235ff539 100644 --- a/clocks/widget.go +++ b/clocks/widget.go @@ -32,7 +32,6 @@ func NewWidget(app *tview.Application) *Widget { /* -------------------- Exported Functions -------------------- */ func (widget *Widget) Refresh() { - widget.UpdateRefreshedAt() widget.display(widget.clockColl.Sorted(), widget.dateFormat, widget.timeFormat) } diff --git a/cmdrunner/widget.go b/cmdrunner/widget.go index b3b1bae0..8f63a04b 100644 --- a/cmdrunner/widget.go +++ b/cmdrunner/widget.go @@ -31,7 +31,6 @@ func NewWidget(app *tview.Application) *Widget { } func (widget *Widget) Refresh() { - widget.UpdateRefreshedAt() widget.execute() title := tview.TranslateANSI(wtf.Config.UString("wtf.mods.cmdrunner.title", widget.String())) diff --git a/cryptoexchanges/bittrex/widget.go b/cryptoexchanges/bittrex/widget.go index dc7900b2..4731abbd 100644 --- a/cryptoexchanges/bittrex/widget.go +++ b/cryptoexchanges/bittrex/widget.go @@ -98,7 +98,6 @@ func makeMarketCurrency(name string) *mCurrency { // Refresh & update after interval time func (widget *Widget) Refresh() { widget.updateSummary() - widget.UpdateRefreshedAt() widget.display() } diff --git a/cryptoexchanges/blockfolio/widget.go b/cryptoexchanges/blockfolio/widget.go index 3d97127c..86355213 100644 --- a/cryptoexchanges/blockfolio/widget.go +++ b/cryptoexchanges/blockfolio/widget.go @@ -29,7 +29,6 @@ func NewWidget(app *tview.Application) *Widget { /* -------------------- Exported Functions -------------------- */ func (widget *Widget) Refresh() { - widget.UpdateRefreshedAt() widget.View.SetTitle(" Blockfolio ") positions, err := Fetch(widget.device_token) diff --git a/cryptoexchanges/cryptolive/widget.go b/cryptoexchanges/cryptolive/widget.go index 0b5601a7..ea129f8c 100644 --- a/cryptoexchanges/cryptolive/widget.go +++ b/cryptoexchanges/cryptolive/widget.go @@ -42,8 +42,6 @@ func (widget *Widget) Refresh() { widget.toplistWidget.Refresh(&wg) wg.Wait() - widget.UpdateRefreshedAt() - display(widget) } diff --git a/datadog/widget.go b/datadog/widget.go index d9edb7c2..b593b5b5 100644 --- a/datadog/widget.go +++ b/datadog/widget.go @@ -25,7 +25,6 @@ func NewWidget(app *tview.Application) *Widget { func (widget *Widget) Refresh() { monitors, monitorErr := Monitors() - widget.UpdateRefreshedAt() widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s", widget.Name))) widget.View.Clear() diff --git a/gcal/widget.go b/gcal/widget.go index 9fcef41a..f1f6409f 100644 --- a/gcal/widget.go +++ b/gcal/widget.go @@ -37,7 +37,6 @@ func (widget *Widget) Disable() { } func (widget *Widget) Refresh() { - defer widget.UpdateRefreshedAt() if isAuthenticated() { widget.fetchAndDisplayEvents() return diff --git a/gerrit/widget.go b/gerrit/widget.go index 44c18c2e..6ab8fb3a 100644 --- a/gerrit/widget.go +++ b/gerrit/widget.go @@ -104,7 +104,6 @@ func (widget *Widget) Refresh() { project.Refresh() } - widget.UpdateRefreshedAt() widget.display() } diff --git a/git/widget.go b/git/widget.go index 5410de9f..672c9754 100644 --- a/git/widget.go +++ b/git/widget.go @@ -81,7 +81,6 @@ func (widget *Widget) Pull() { func (widget *Widget) Refresh() { repoPaths := wtf.ToStrs(wtf.Config.UList("wtf.mods.git.repositories")) - widget.UpdateRefreshedAt() widget.Data = widget.gitRepos(repoPaths) widget.display() } diff --git a/github/widget.go b/github/widget.go index 21fa0824..51fb750a 100644 --- a/github/widget.go +++ b/github/widget.go @@ -51,7 +51,6 @@ func (widget *Widget) Refresh() { repo.Refresh() } - widget.UpdateRefreshedAt() widget.display() } diff --git a/gitlab/widget.go b/gitlab/widget.go index 05066562..95cfc5f4 100644 --- a/gitlab/widget.go +++ b/gitlab/widget.go @@ -63,7 +63,6 @@ func (widget *Widget) Refresh() { project.Refresh() } - widget.UpdateRefreshedAt() widget.display() } diff --git a/gitter/widget.go b/gitter/widget.go index d9ec3327..b21b9c82 100644 --- a/gitter/widget.go +++ b/gitter/widget.go @@ -64,7 +64,6 @@ func (widget *Widget) Refresh() { } messages, err := GetMessages(room.ID, wtf.Config.UInt("wtf.mods.gitter.numberOfMessages", 10)) - widget.UpdateRefreshedAt() if err != nil { widget.View.SetWrap(true) diff --git a/gspreadsheets/widget.go b/gspreadsheets/widget.go index 3464af28..cdc58cbb 100644 --- a/gspreadsheets/widget.go +++ b/gspreadsheets/widget.go @@ -25,8 +25,6 @@ func NewWidget(app *tview.Application) *Widget { func (widget *Widget) Refresh() { cells, _ := Fetch() - widget.UpdateRefreshedAt() - widget.View.SetText(widget.contentFrom(cells)) } diff --git a/hackernews/widget.go b/hackernews/widget.go index 7c750587..a2e19c70 100644 --- a/hackernews/widget.go +++ b/hackernews/widget.go @@ -79,7 +79,6 @@ func (widget *Widget) Refresh() { widget.stories = stories } - widget.UpdateRefreshedAt() widget.display() } diff --git a/ipaddresses/ipapi/widget.go b/ipaddresses/ipapi/widget.go index b19adf64..9d24d090 100644 --- a/ipaddresses/ipapi/widget.go +++ b/ipaddresses/ipapi/widget.go @@ -51,7 +51,6 @@ func NewWidget(app *tview.Application) *Widget { // Refresh refresh the module func (widget *Widget) Refresh() { - widget.UpdateRefreshedAt() widget.ipinfo() widget.View.SetText(widget.result) } diff --git a/ipaddresses/ipinfo/widget.go b/ipaddresses/ipinfo/widget.go index 5e3d023b..c54fd2fb 100644 --- a/ipaddresses/ipinfo/widget.go +++ b/ipaddresses/ipinfo/widget.go @@ -43,7 +43,6 @@ func NewWidget(app *tview.Application) *Widget { } func (widget *Widget) Refresh() { - widget.UpdateRefreshedAt() widget.ipinfo() widget.View.Clear() diff --git a/jenkins/widget.go b/jenkins/widget.go index 22d9b3f7..aaeb149a 100644 --- a/jenkins/widget.go +++ b/jenkins/widget.go @@ -61,8 +61,6 @@ func (widget *Widget) Refresh() { ) widget.view = view - widget.UpdateRefreshedAt() - if err != nil { widget.View.SetWrap(true) widget.View.SetTitle(widget.ContextualTitle(widget.Name)) diff --git a/jira/widget.go b/jira/widget.go index 0bef14dc..4064f0d0 100644 --- a/jira/widget.go +++ b/jira/widget.go @@ -54,8 +54,6 @@ func (widget *Widget) Refresh() { wtf.Config.UString("wtf.mods.jira.jql", ""), ) - widget.UpdateRefreshedAt() - if err != nil { widget.result = nil widget.View.SetWrap(true) diff --git a/logger/log.go b/logger/log.go index 97b64a0a..11d61525 100644 --- a/logger/log.go +++ b/logger/log.go @@ -52,7 +52,6 @@ func (widget *Widget) Refresh() { return } - widget.UpdateRefreshedAt() widget.View.SetTitle(widget.Name) logLines := widget.tailFile() diff --git a/mercurial/widget.go b/mercurial/widget.go index 083396f4..302ae2fb 100644 --- a/mercurial/widget.go +++ b/mercurial/widget.go @@ -81,7 +81,6 @@ func (widget *Widget) Pull() { func (widget *Widget) Refresh() { repoPaths := wtf.ToStrs(wtf.Config.UList("wtf.mods.mercurial.repositories")) - widget.UpdateRefreshedAt() widget.Data = widget.mercurialRepos(repoPaths) widget.display() } @@ -141,7 +140,7 @@ func (widget *Widget) modalFrame(form *tview.Form) *tview.Frame { return frame } -func (widget *Widget) currentData() *MercurialRepo{ +func (widget *Widget) currentData() *MercurialRepo { if len(widget.Data) == 0 { return nil } @@ -153,7 +152,7 @@ func (widget *Widget) currentData() *MercurialRepo{ return widget.Data[widget.Idx] } -func (widget *Widget) mercurialRepos(repoPaths []string) []*MercurialRepo{ +func (widget *Widget) mercurialRepos(repoPaths []string) []*MercurialRepo { repos := []*MercurialRepo{} for _, repoPath := range repoPaths { diff --git a/newrelic/widget.go b/newrelic/widget.go index 4ff45e1e..eca62c53 100644 --- a/newrelic/widget.go +++ b/newrelic/widget.go @@ -31,7 +31,6 @@ func (widget *Widget) Refresh() { appName = app.Name } - widget.UpdateRefreshedAt() widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s - [green]%s[white]", widget.Name, appName))) widget.View.Clear() diff --git a/opsgenie/widget.go b/opsgenie/widget.go index 06a10d00..9d477424 100644 --- a/opsgenie/widget.go +++ b/opsgenie/widget.go @@ -25,7 +25,6 @@ func NewWidget(app *tview.Application) *Widget { func (widget *Widget) Refresh() { data, err := Fetch() - widget.UpdateRefreshedAt() widget.View.SetTitle(widget.ContextualTitle(widget.Name)) var content string diff --git a/power/widget.go b/power/widget.go index f0a34482..b0698f71 100644 --- a/power/widget.go +++ b/power/widget.go @@ -25,7 +25,6 @@ func NewWidget(app *tview.Application) *Widget { } func (widget *Widget) Refresh() { - widget.UpdateRefreshedAt() widget.Battery.Refresh() content := "" diff --git a/security/widget.go b/security/widget.go index 2a5e2252..8982412f 100644 --- a/security/widget.go +++ b/security/widget.go @@ -28,7 +28,6 @@ func (widget *Widget) Refresh() { data := NewSecurityData() data.Fetch() - widget.UpdateRefreshedAt() widget.View.SetText(widget.contentFrom(data)) } diff --git a/security/widget_windows.go b/security/widget_windows.go index 62c950ba..64f7ded2 100644 --- a/security/widget_windows.go +++ b/security/widget_windows.go @@ -32,7 +32,6 @@ func (widget *Widget) Refresh() { data := NewSecurityData() data.Fetch() - widget.UpdateRefreshedAt() widget.View.SetText(widget.contentFrom(data)) } diff --git a/spotify/widget.go b/spotify/widget.go index 5736884d..3c0b5fb4 100644 --- a/spotify/widget.go +++ b/spotify/widget.go @@ -49,7 +49,6 @@ func (w *Widget) refreshSpotifyInfos() error { func (w *Widget) Refresh() { w.render() - w.UpdateRefreshedAt() } func (w *Widget) render() { diff --git a/status/widget.go b/status/widget.go index 8ff9547e..78476dd4 100644 --- a/status/widget.go +++ b/status/widget.go @@ -23,7 +23,6 @@ func NewWidget(app *tview.Application) *Widget { /* -------------------- Exported Functions -------------------- */ func (widget *Widget) Refresh() { - widget.UpdateRefreshedAt() widget.View.SetText(widget.animation()) } diff --git a/system/widget.go b/system/widget.go index 8059ca00..769aaf2d 100644 --- a/system/widget.go +++ b/system/widget.go @@ -30,8 +30,6 @@ func NewWidget(app *tview.Application, date, version string) *Widget { } func (widget *Widget) Refresh() { - widget.UpdateRefreshedAt() - widget.View.SetText( fmt.Sprintf( "%8s: %s\n%8s: %s\n\n%8s: %s\n%8s: %s", diff --git a/todo/widget.go b/todo/widget.go index 57610fff..ce0e5cff 100644 --- a/todo/widget.go +++ b/todo/widget.go @@ -69,7 +69,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages) *Widget { /* -------------------- Exported Functions -------------------- */ func (widget *Widget) Refresh() { - widget.UpdateRefreshedAt() widget.load() widget.display() diff --git a/todoist/widget.go b/todoist/widget.go index 4897a223..344db45f 100644 --- a/todoist/widget.go +++ b/todoist/widget.go @@ -87,7 +87,6 @@ func (w *Widget) Refresh() { return } - w.UpdateRefreshedAt() w.display() } diff --git a/travisci/widget.go b/travisci/widget.go index 8a140019..57e7a491 100644 --- a/travisci/widget.go +++ b/travisci/widget.go @@ -53,8 +53,6 @@ func (widget *Widget) Refresh() { builds, err := BuildsFor() - widget.UpdateRefreshedAt() - if err != nil { widget.View.SetWrap(true) widget.View.SetTitle(widget.Name) diff --git a/trello/widget.go b/trello/widget.go index 84424db0..63e99835 100644 --- a/trello/widget.go +++ b/trello/widget.go @@ -31,7 +31,6 @@ func (widget *Widget) Refresh() { // Get the cards searchResult, err := GetCards(client, getLists()) - widget.UpdateRefreshedAt() var content string if err != nil { diff --git a/twitter/widget.go b/twitter/widget.go index 8ccb28e8..181f0868 100644 --- a/twitter/widget.go +++ b/twitter/widget.go @@ -60,7 +60,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages) *Widget { // Refresh is called on the interval and refreshes the data func (widget *Widget) Refresh() { - widget.UpdateRefreshedAt() widget.display() } diff --git a/weatherservices/prettyweather/widget.go b/weatherservices/prettyweather/widget.go index 879b4da2..b541a0a2 100644 --- a/weatherservices/prettyweather/widget.go +++ b/weatherservices/prettyweather/widget.go @@ -27,7 +27,6 @@ func NewWidget(app *tview.Application) *Widget { } func (widget *Widget) Refresh() { - widget.UpdateRefreshedAt() widget.prettyWeather() widget.View.SetText(widget.result) diff --git a/weatherservices/weather/widget.go b/weatherservices/weather/widget.go index e385acef..c2208c32 100644 --- a/weatherservices/weather/widget.go +++ b/weatherservices/weather/widget.go @@ -73,7 +73,6 @@ func (widget *Widget) Refresh() { widget.Data = widget.Fetch(wtf.ToInts(wtf.Config.UList("wtf.mods.weather.cityids", widget.defaultCityCodes()))) } - widget.UpdateRefreshedAt() widget.display() } diff --git a/wtf/bargraph.go b/wtf/bargraph.go index c38f9f57..a8907781 100644 --- a/wtf/bargraph.go +++ b/wtf/bargraph.go @@ -11,14 +11,13 @@ import ( //BarGraph lets make graphs type BarGraph struct { - enabled bool - focusable bool - starChar string - maxStars int - Name string - RefreshedAt time.Time - RefreshInt int - View *tview.TextView + enabled bool + focusable bool + starChar string + maxStars int + Name string + RefreshInt int + View *tview.TextView Position @@ -90,10 +89,6 @@ func (widget *BarGraph) TextView() *tview.TextView { /* -------------------- Unexported Functions -------------------- */ -func (widget *BarGraph) UpdateRefreshedAt() { - widget.RefreshedAt = time.Now() -} - func (widget *BarGraph) addView() { view := tview.NewTextView() diff --git a/wtf/text_widget.go b/wtf/text_widget.go index 735a7317..3ca58480 100644 --- a/wtf/text_widget.go +++ b/wtf/text_widget.go @@ -2,7 +2,6 @@ package wtf import ( "fmt" - "time" "github.com/olebedev/config" "github.com/rivo/tview" @@ -15,10 +14,9 @@ type TextWidget struct { focusable bool focusChar string - Name string - RefreshedAt time.Time - RefreshInt int - View *tview.TextView + Name string + RefreshInt int + View *tview.TextView Position } @@ -130,7 +128,3 @@ func (widget *TextWidget) addView(app *tview.Application, configKey string) { widget.View = view } - -func (widget *TextWidget) UpdateRefreshedAt() { - widget.RefreshedAt = time.Now() -} diff --git a/zendesk/widget.go b/zendesk/widget.go index 0db6c3cd..767799e3 100644 --- a/zendesk/widget.go +++ b/zendesk/widget.go @@ -36,7 +36,6 @@ func (widget *Widget) Refresh() { } else { widget.result = ticketArray } - widget.UpdateRefreshedAt() widget.display() }