WTF-400 Common settings implemented

2025-01-18 04:03:14 -08:00 · 2019-04-18 18:05:56 -07:00
parent 2ed3c087b8
commit f09d08bda2
52 changed files with 201 additions and 131 deletions
--- a/modules/bamboohr/widget.go
+++ b/modules/bamboohr/widget.go
@@ -17,7 +17,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		settings: settings,
 	}
--- a/modules/circleci/widget.go
+++ b/modules/circleci/widget.go
@@ -16,7 +16,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),
 		Client:     NewClient(settings.apiKey),

 		settings: settings,
--- a/modules/clocks/widget.go
+++ b/modules/clocks/widget.go
@@ -19,7 +19,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		settings:   settings,
 		dateFormat: settings.dateFormat,
--- a/modules/cmdrunner/widget.go
+++ b/modules/cmdrunner/widget.go
@@ -20,7 +20,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		args:     settings.args,
 		cmd:      settings.cmd,
--- a/modules/cryptoexchanges/bittrex/widget.go
+++ b/modules/cryptoexchanges/bittrex/widget.go
@@ -27,7 +27,7 @@ type Widget struct {
 // NewWidget Make new instance of widget
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		settings:    settings,
 		summaryList: summaryList{},
--- a/modules/cryptoexchanges/blockfolio/widget.go
+++ b/modules/cryptoexchanges/blockfolio/widget.go
@@ -20,7 +20,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		device_token: settings.deviceToken,
 		settings:     settings,
--- a/modules/cryptoexchanges/cryptolive/widget.go
+++ b/modules/cryptoexchanges/cryptolive/widget.go
@@ -22,7 +22,7 @@ type Widget struct {
 // NewWidget Make new instance of widget
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		priceWidget:   price.NewWidget(settings.priceSettings),
 		toplistWidget: toplist.NewWidget(settings.toplistSettings),
--- a/modules/datadog/widget.go
+++ b/modules/datadog/widget.go
@@ -16,7 +16,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		settings: settings,
 	}
--- a/modules/gcal/widget.go
+++ b/modules/gcal/widget.go
@@ -20,7 +20,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget: wtf.NewTextWidget(app, settings.common, true),

 		app:      app,
 		ch:       make(chan struct{}),
--- a/modules/gerrit/widget.go
+++ b/modules/gerrit/widget.go
@@ -49,7 +49,7 @@ var (
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common, true),

 		Idx:      0,
 		settings: settings,
--- a/modules/git/widget.go
+++ b/modules/git/widget.go
@@ -42,8 +42,8 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget:     wtf.NewHelpfulWidget(app, pages, HelpText),
-		MultiSourceWidget: wtf.NewMultiSourceWidget("git", "repository", "repositories"),
-		TextWidget:        wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.ConfigKey, "repository", "repositories"),
+		TextWidget:        wtf.NewTextWidget(app, settings.common, true),

 		app:      app,
 		pages:    pages,
--- a/modules/github/widget.go
+++ b/modules/github/widget.go
@@ -32,7 +32,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common, true),

 		Idx:      0,
 		settings: settings,
--- a/modules/gitlab/widget.go
+++ b/modules/gitlab/widget.go
@@ -39,7 +39,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *

 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common, true),

 		Idx:      0,
 		gitlab:   gitlab,
--- a/modules/gitter/widget.go
+++ b/modules/gitter/widget.go
@@ -32,7 +32,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common, true),

 		settings: settings,
 	}
--- a/modules/gspreadsheets/widget.go
+++ b/modules/gspreadsheets/widget.go
@@ -16,7 +16,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		settings: settings,
 	}
--- a/modules/hackernews/widget.go
+++ b/modules/hackernews/widget.go
@@ -38,7 +38,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common, true),

 		settings: settings,
 	}
--- a/modules/ipaddresses/ipapi/widget.go
+++ b/modules/ipaddresses/ipapi/widget.go
@@ -38,7 +38,7 @@ type ipinfo struct {
 // NewWidget constructor
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		settings: settings,
 	}
--- a/modules/ipaddresses/ipinfo/widget.go
+++ b/modules/ipaddresses/ipinfo/widget.go
@@ -31,7 +31,7 @@ type ipinfo struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		settings: settings,
 	}
--- a/modules/jenkins/widget.go
+++ b/modules/jenkins/widget.go
@@ -36,7 +36,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common, true),

 		settings: settings,
 	}
--- a/modules/jira/widget.go
+++ b/modules/jira/widget.go
@@ -34,7 +34,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common, true),

 		settings: settings,
 	}
--- a/modules/mercurial/widget.go
+++ b/modules/mercurial/widget.go
@@ -38,7 +38,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	widget := Widget{
 		HelpfulWidget:     wtf.NewHelpfulWidget(app, pages, HelpText),
 		MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.ConfigKey, "repository", "repositories"),
-		TextWidget:        wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:        wtf.NewTextWidget(app, settings.common, true),

 		app:      app,
 		pages:    pages,
--- a/modules/nbascore/widget.go
+++ b/modules/nbascore/widget.go
@@ -33,7 +33,7 @@ var offset = 0
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common, true),

 		settings: settings,
 	}
--- a/modules/newrelic/widget.go
+++ b/modules/newrelic/widget.go
@@ -17,7 +17,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		settings: settings,
 	}
--- a/modules/opsgenie/widget.go
+++ b/modules/opsgenie/widget.go
@@ -16,7 +16,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		settings: settings,
 	}
--- a/modules/pagerduty/widget.go
+++ b/modules/pagerduty/widget.go
@@ -17,7 +17,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		settings: settings,
 	}
--- a/modules/power/widget.go
+++ b/modules/power/widget.go
@@ -16,7 +16,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		Battery:  NewBattery(),
 		settings: settings,
--- a/modules/rollbar/widget.go
+++ b/modules/rollbar/widget.go
@@ -35,7 +35,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common, true),

 		settings: settings,
 	}
--- a/modules/security/widget.go
+++ b/modules/security/widget.go
@@ -16,7 +16,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		settings: settings,
 	}
--- a/modules/spotify/widget.go
+++ b/modules/spotify/widget.go
@@ -30,14 +30,16 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	spotifyClient := spotigopher.NewClient()
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common, true),

 		Info:          spotigopher.Info{},
 		SpotifyClient: spotifyClient,
 		settings:      settings,
 	}
+
+	widget.settings.common.RefreshInterval = 5
+
 	widget.HelpfulWidget.SetView(widget.View)
-	widget.TextWidget.RefreshInt = 5
 	widget.View.SetInputCapture(widget.captureInput)
 	widget.View.SetWrap(true)
 	widget.View.SetWordWrap(true)
--- a/modules/spotifyweb/widget.go
+++ b/modules/spotifyweb/widget.go
@@ -93,7 +93,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *

 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common, true),

 		Info:        Info{},
 		client:      client,
@@ -135,8 +135,9 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	// If inconvenient, I'll remove this option and save the URL in a file or some other method.
 	wtf.OpenFile(`"` + authURL + `"`)

+	widget.settings.common.RefreshInterval = 5
+
 	widget.HelpfulWidget.SetView(widget.View)
-	widget.TextWidget.RefreshInt = 5
 	widget.View.SetInputCapture(widget.captureInput)
 	widget.View.SetWrap(true)
 	widget.View.SetWordWrap(true)
--- a/modules/status/widget.go
+++ b/modules/status/widget.go
@@ -14,7 +14,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		CurrentIcon: 0,
 		settings:    settings,
--- a/modules/system/widget.go
+++ b/modules/system/widget.go
@@ -19,7 +19,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, date, version string, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		Date:     date,
 		settings: settings,
--- a/modules/textfile/widget.go
+++ b/modules/textfile/widget.go
@@ -42,19 +42,17 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	widget := Widget{
 		HelpfulWidget:     wtf.NewHelpfulWidget(app, pages, HelpText),
 		MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.ConfigKey, "filePath", "filePaths"),
-		TextWidget:        wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:        wtf.NewTextWidget(app, settings.common, true),

 		settings: settings,
 	}

 	// Don't use a timer for this widget, watch for filesystem changes instead
-	widget.RefreshInt = 0
-
-	widget.LoadSources()
-	widget.SetDisplayFunction(widget.display)
+	widget.settings.common.RefreshInterval = 0

 	widget.HelpfulWidget.SetView(widget.View)
-
+	widget.LoadSources()
+	widget.SetDisplayFunction(widget.display)
 	widget.View.SetWrap(true)
 	widget.View.SetWordWrap(true)
 	widget.View.SetInputCapture(widget.keyboardIntercept)
--- a/modules/todo/widget.go
+++ b/modules/todo/widget.go
@@ -49,7 +49,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common, true),

 		app:      app,
 		settings: settings,
--- a/modules/todoist/widget.go
+++ b/modules/todoist/widget.go
@@ -37,7 +37,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common, true),

 		settings: settings,
 	}
--- a/modules/travisci/widget.go
+++ b/modules/travisci/widget.go
@@ -34,7 +34,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common, true),

 		settings: settings,
 	}
--- a/modules/trello/widget.go
+++ b/modules/trello/widget.go
@@ -16,7 +16,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		settings: settings,
 	}
--- a/modules/twitter/widget.go
+++ b/modules/twitter/widget.go
@@ -37,7 +37,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	widget := Widget{
 		HelpfulWidget:     wtf.NewHelpfulWidget(app, pages, HelpText),
 		MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.ConfigKey, "screenName", "screenNames"),
-		TextWidget:        wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:        wtf.NewTextWidget(app, settings.common, true),

 		idx:      0,
 		settings: settings,
--- a/modules/unknown/widget.go
+++ b/modules/unknown/widget.go
@@ -15,7 +15,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, name string, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, name, name, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		settings: settings,
 	}
--- a/modules/victorops/widget.go
+++ b/modules/victorops/widget.go
@@ -27,7 +27,7 @@ type Widget struct {
 // NewWidget creates a new widget
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget: wtf.NewTextWidget(app, settings.common, true),
 	}

 	widget.View.SetScrollable(true)
--- a/modules/weatherservices/prettyweather/widget.go
+++ b/modules/weatherservices/prettyweather/widget.go
@@ -18,7 +18,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
+		TextWidget: wtf.NewTextWidget(app, settings.common, false),

 		settings: settings,
 	}
--- a/modules/weatherservices/weather/widget.go
+++ b/modules/weatherservices/weather/widget.go
@@ -33,7 +33,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common, true),

 		Idx:      0,
 		settings: settings,
--- a/modules/zendesk/widget.go
+++ b/modules/zendesk/widget.go
@@ -19,7 +19,7 @@ type Widget struct {

 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
+		TextWidget: wtf.NewTextWidget(app, settings.common, true),

 		settings: settings,
 	}