Merge branch 'master' into addLogging

bamboohr/widget.go

@@ -25,10 +25,6 @@ func NewWidget() *Widget {
 /* -------------------- Exported Functions -------------------- */
 
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	client := NewClient("https://api.bamboohr.com/api/gateway.php")
 	todayItems := client.Away(
 		"timeOff",

clocks/widget.go

@@ -29,10 +29,6 @@ func NewWidget() *Widget {
 /* -------------------- Exported Functions -------------------- */
 
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	widget.UpdateRefreshedAt()
 	widget.display(widget.clockColl.Sorted())
 }

cmdrunner/widget.go

@@ -34,10 +34,6 @@ func NewWidget() *Widget {
 }
 
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	widget.UpdateRefreshedAt()
 	widget.execute()
 	widget.View.SetTitle(fmt.Sprintf(" %s ", widget))

cryptoexchanges/bittrex/widget.go

@@ -100,10 +100,6 @@ func makeMarketCurrency(name string) *mCurrency {
 
 // Refresh & update after interval time
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	widget.updateSummary()
 	widget.UpdateRefreshedAt()
 	widget.display()

cryptoexchanges/cryptolive/widget.go

@@ -38,10 +38,6 @@ func NewWidget() *Widget {
 
 // Refresh & update after interval time
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	widget.updateCurrencies()
 	widget.UpdateRefreshedAt()
 

gcal/widget.go

@@ -29,10 +29,6 @@ func NewWidget() *Widget {
 /* -------------------- Exported Functions -------------------- */
 
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	events, _ := Fetch()
 
 	widget.UpdateRefreshedAt()

git/widget.go

@@ -49,10 +49,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages) *Widget {
 /* -------------------- Exported Functions -------------------- */
 
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	repoPaths := wtf.ToStrs(Config.UList("wtf.mods.git.repositories"))
 
 	widget.UpdateRefreshedAt()

github/widget.go

@@ -51,10 +51,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages) *Widget {
 /* -------------------- Exported Functions -------------------- */
 
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	for _, repo := range widget.GithubRepos {
 		repo.Refresh()
 	}

ipinfo/widget.go

@@ -47,10 +47,6 @@ func NewWidget() *Widget {
 }
 
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	widget.UpdateRefreshedAt()
 	widget.ipinfo()
 	widget.View.Clear()
@@ -73,10 +69,7 @@ func (widget *Widget) ipinfo() {
 		return
 	}
 	defer response.Body.Close()
-	if err != nil {
+
-		widget.result = fmt.Sprintf("%s", err.Error())
-		return
-	}
 	var info ipinfo
 	err = json.NewDecoder(response.Body).Decode(&info)
 	if err != nil {

jira/widget.go

@@ -25,10 +25,6 @@ func NewWidget() *Widget {
 /* -------------------- Exported Functions -------------------- */
 
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	searchResult, err := IssuesFor(Config.UString("wtf.mods.jira.username"), Config.UString("wtf.mods.jira.project", ""), Config.UString("wtf.mods.jira.jql", ""))
 
 	widget.UpdateRefreshedAt()

newrelic/widget.go

@@ -26,10 +26,6 @@ func NewWidget() *Widget {
 /* -------------------- Exported Functions -------------------- */
 
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	app, appErr := Application()
 	deploys, depErr := Deployments()
 

opsgenie/widget.go

@@ -26,10 +26,6 @@ func NewWidget() *Widget {
 /* -------------------- Exported Functions -------------------- */
 
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	data, err := Fetch()
 
 	widget.UpdateRefreshedAt()

power/widget.go

@@ -28,10 +28,6 @@ func NewWidget() *Widget {
 }
 
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	widget.UpdateRefreshedAt()
 	widget.Battery.Refresh()
 

prettyweather/widget.go

@@ -30,10 +30,6 @@ func NewWidget() *Widget {
 }
 
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	widget.UpdateRefreshedAt()
 	widget.prettyWeather()
 

security/widget.go

@@ -26,10 +26,6 @@ func NewWidget() *Widget {
 /* -------------------- Exported Functions -------------------- */
 
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	data := NewSecurityData()
 	data.Fetch()
 

status/widget.go

@@ -28,10 +28,6 @@ func NewWidget() *Widget {
 /* -------------------- Exported Functions -------------------- */
 
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	widget.UpdateRefreshedAt()
 
 	widget.View.SetText(

system/widget.go

@@ -33,10 +33,6 @@ func NewWidget(date, version string) *Widget {
 }
 
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	widget.UpdateRefreshedAt()
 
 	widget.View.SetText(

textfile/widget.go

@@ -48,10 +48,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages) *Widget {
 /* -------------------- Exported Functions -------------------- */
 
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	widget.UpdateRefreshedAt()
 	widget.View.SetTitle(fmt.Sprintf("%s %s", widget.Name, widget.filePath))
 

todo/widget.go

@@ -61,10 +61,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages) *Widget {
 /* -------------------- Exported Functions -------------------- */
 
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	widget.UpdateRefreshedAt()
 	widget.load()
 	widget.display()

weather/widget.go

@@ -74,10 +74,6 @@ func (widget *Widget) Fetch(cityIDs []int) []*owm.CurrentWeatherData {
 // Refresh fetches new data from the OpenWeatherMap API and loads the new data into the.
 // widget's view for rendering
 func (widget *Widget) Refresh() {
-	if widget.Disabled() {
-		return
-	}
-
 	widget.Data = widget.Fetch(wtf.ToInts(Config.UList("wtf.mods.weather.cityids", widget.defaultCityCodes())))
 
 	widget.UpdateRefreshedAt()

wtf.go

@@ -121,6 +121,8 @@ func watchForConfigChanges(app *tview.Application, configFlag string, grid *tvie
 			select {
 			case <-watch.Event:
 				loadConfig(configFlag)
+				// Disable all widgets to stop scheduler goroutines and rmeove widgets from memory.
+				disableAllWidgets()
 				makeWidgets(app, pages)
 				grid = buildGrid(Widgets)
 				pages.AddPage("grid", grid, true, true)
@@ -155,6 +157,12 @@ var (
 	version = "dev"
 )
 
+func disableAllWidgets() {
+	for _, widget := range Widgets {
+		widget.Disable()
+	}
+}
+
 func addWidget(app *tview.Application, pages *tview.Pages, widgetName string) {
 	// Always in alphabetical order
 	switch widgetName {

wtf/enabler.go

@@ -3,4 +3,5 @@ package wtf
 type Enabler interface {
 	Disabled() bool
 	Enabled() bool
+	Disable()
 }

wtf/text_widget.go

@@ -61,6 +61,10 @@ func (widget *TextWidget) Enabled() bool {
 	return widget.enabled
 }
 
+func (widget *TextWidget) Disable() {
+	widget.enabled = false
+}
+
 func (widget *TextWidget) Focusable() bool {
 	return widget.enabled && widget.focusable
 }