From 3a96c303a867b4b5f86f3b0792450aa9f1652962 Mon Sep 17 00:00:00 2001 From: Sean Smith Date: Sat, 27 Apr 2019 12:15:55 -0400 Subject: [PATCH 1/2] Allow duplicates of modules This leverages the recent config changes, extending it so that config is literally using passed config, rather than passed config value Uses cmdRunner as an example for #181 Because config turns into a map, names are the root keys, and an optional type is provided --- maker/widget_maker.go | 94 ++++++++++++++++++----------------- modules/cmdrunner/settings.go | 8 +-- 2 files changed, 52 insertions(+), 50 deletions(-) diff --git a/maker/widget_maker.go b/maker/widget_maker.go index 5b9a0236..723dc79f 100644 --- a/maker/widget_maker.go +++ b/maker/widget_maker.go @@ -56,147 +56,148 @@ func MakeWidget( app *tview.Application, pages *tview.Pages, widgetName string, + widgetType string, moduleConfig *config.Config, globalConfig *config.Config, ) wtf.Wtfable { var widget wtf.Wtfable // Always in alphabetical order - switch widgetName { + switch widgetType { case "bamboohr": - settings := bamboohr.NewSettingsFromYAML("BambooHR", moduleConfig, globalConfig) + settings := bamboohr.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = bamboohr.NewWidget(app, settings) case "bargraph": settings := bargraph.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = bargraph.NewWidget(app, settings) case "bittrex": - settings := bittrex.NewSettingsFromYAML("Bittrex", moduleConfig, globalConfig) + settings := bittrex.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = bittrex.NewWidget(app, settings) case "blockfolio": - settings := blockfolio.NewSettingsFromYAML("Blockfolio", moduleConfig, globalConfig) + settings := blockfolio.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = blockfolio.NewWidget(app, settings) case "circleci": - settings := circleci.NewSettingsFromYAML("CircleCI", moduleConfig, globalConfig) + settings := circleci.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = circleci.NewWidget(app, settings) case "clocks": - settings := clocks.NewSettingsFromYAML("Clocks", moduleConfig, globalConfig) + settings := clocks.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = clocks.NewWidget(app, settings) case "cmdrunner": - settings := cmdrunner.NewSettingsFromYAML("CmdRunner", moduleConfig, globalConfig) + settings := cmdrunner.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = cmdrunner.NewWidget(app, settings) case "cryptolive": - settings := cryptolive.NewSettingsFromYAML("CryptoLive", moduleConfig, globalConfig) + settings := cryptolive.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = cryptolive.NewWidget(app, settings) case "datadog": - settings := datadog.NewSettingsFromYAML("DataDog", moduleConfig, globalConfig) + settings := datadog.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = datadog.NewWidget(app, settings) case "gcal": - settings := gcal.NewSettingsFromYAML("Calendar", moduleConfig, globalConfig) + settings := gcal.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = gcal.NewWidget(app, settings) case "gerrit": - settings := gerrit.NewSettingsFromYAML("Gerrit", moduleConfig, globalConfig) + settings := gerrit.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = gerrit.NewWidget(app, pages, settings) case "git": - settings := git.NewSettingsFromYAML("Git", moduleConfig, globalConfig) + settings := git.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = git.NewWidget(app, pages, settings) case "github": - settings := github.NewSettingsFromYAML("GitHub", moduleConfig, globalConfig) + settings := github.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = github.NewWidget(app, pages, settings) case "gitlab": - settings := gitlab.NewSettingsFromYAML("GitLab", moduleConfig, globalConfig) + settings := gitlab.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = gitlab.NewWidget(app, pages, settings) case "gitter": - settings := gitter.NewSettingsFromYAML("Gitter", moduleConfig, globalConfig) + settings := gitter.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = gitter.NewWidget(app, pages, settings) case "gspreadsheets": - settings := gspreadsheets.NewSettingsFromYAML("Google Spreadsheets", moduleConfig, globalConfig) + settings := gspreadsheets.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = gspreadsheets.NewWidget(app, settings) case "hackernews": - settings := hackernews.NewSettingsFromYAML("HackerNews", moduleConfig, globalConfig) + settings := hackernews.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = hackernews.NewWidget(app, pages, settings) case "ipapi": - settings := ipapi.NewSettingsFromYAML("IPAPI", moduleConfig, globalConfig) + settings := ipapi.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = ipapi.NewWidget(app, settings) case "ipinfo": - settings := ipinfo.NewSettingsFromYAML("IPInfo", moduleConfig, globalConfig) + settings := ipinfo.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = ipinfo.NewWidget(app, settings) case "jenkins": - settings := jenkins.NewSettingsFromYAML("Jenkins", moduleConfig, globalConfig) + settings := jenkins.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = jenkins.NewWidget(app, pages, settings) case "jira": - settings := jira.NewSettingsFromYAML("Jira", moduleConfig, globalConfig) + settings := jira.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = jira.NewWidget(app, pages, settings) case "logger": - settings := logger.NewSettingsFromYAML("Log", moduleConfig, globalConfig) + settings := logger.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = logger.NewWidget(app, settings) case "mercurial": - settings := mercurial.NewSettingsFromYAML("Mercurial", moduleConfig, globalConfig) + settings := mercurial.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = mercurial.NewWidget(app, pages, settings) case "nbascore": - settings := nbascore.NewSettingsFromYAML("NBA Score", moduleConfig, globalConfig) + settings := nbascore.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = nbascore.NewWidget(app, pages, settings) case "newrelic": - settings := newrelic.NewSettingsFromYAML("NewRelic", moduleConfig, globalConfig) + settings := newrelic.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = newrelic.NewWidget(app, settings) case "opsgenie": - settings := opsgenie.NewSettingsFromYAML("OpsGenie", moduleConfig, globalConfig) + settings := opsgenie.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = opsgenie.NewWidget(app, settings) case "pagerduty": - settings := pagerduty.NewSettingsFromYAML("PagerDuty", moduleConfig, globalConfig) + settings := pagerduty.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = pagerduty.NewWidget(app, settings) case "power": - settings := power.NewSettingsFromYAML("Power", moduleConfig, globalConfig) + settings := power.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = power.NewWidget(app, settings) case "prettyweather": - settings := prettyweather.NewSettingsFromYAML("Pretty Weather", moduleConfig, globalConfig) + settings := prettyweather.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = prettyweather.NewWidget(app, settings) case "resourceusage": - settings := resourceusage.NewSettingsFromYAML("Resource Usage", moduleConfig, globalConfig) + settings := resourceusage.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = resourceusage.NewWidget(app, settings) case "rollbar": - settings := rollbar.NewSettingsFromYAML("Rollbar", moduleConfig, globalConfig) + settings := rollbar.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = rollbar.NewWidget(app, pages, settings) case "security": - settings := security.NewSettingsFromYAML("Security", moduleConfig, globalConfig) + settings := security.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = security.NewWidget(app, settings) case "spotify": - settings := spotify.NewSettingsFromYAML("Spotify", moduleConfig, globalConfig) + settings := spotify.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = spotify.NewWidget(app, pages, settings) case "spotifyweb": - settings := spotifyweb.NewSettingsFromYAML("Spotify Web", moduleConfig, globalConfig) + settings := spotifyweb.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = spotifyweb.NewWidget(app, pages, settings) case "status": - settings := status.NewSettingsFromYAML("Status", moduleConfig, globalConfig) + settings := status.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = status.NewWidget(app, settings) // case "system": - // settings := system.NewSettingsFromYAML("System", moduleConfig, globalConfig) + // settings := system.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) // widget = system.NewWidget(app, date, version, settings) case "textfile": - settings := textfile.NewSettingsFromYAML("Textfile", moduleConfig, globalConfig) + settings := textfile.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = textfile.NewWidget(app, pages, settings) case "todo": - settings := todo.NewSettingsFromYAML("Todo", moduleConfig, globalConfig) + settings := todo.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = todo.NewWidget(app, pages, settings) case "todoist": - settings := todoist.NewSettingsFromYAML("Todoist", moduleConfig, globalConfig) + settings := todoist.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = todoist.NewWidget(app, pages, settings) case "travisci": - settings := travisci.NewSettingsFromYAML("TravisCI", moduleConfig, globalConfig) + settings := travisci.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = travisci.NewWidget(app, pages, settings) case "trello": - settings := trello.NewSettingsFromYAML("Trello", moduleConfig, globalConfig) + settings := trello.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = trello.NewWidget(app, settings) case "twitter": - settings := twitter.NewSettingsFromYAML("Twitter", moduleConfig, globalConfig) + settings := twitter.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = twitter.NewWidget(app, pages, settings) case "victorops": - settings := victorops.NewSettingsFromYAML("VictorOps - OnCall", moduleConfig, globalConfig) + settings := victorops.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = victorops.NewWidget(app, settings) case "weather": - settings := weather.NewSettingsFromYAML("Weather", moduleConfig, globalConfig) + settings := weather.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = weather.NewWidget(app, pages, settings) case "zendesk": - settings := zendesk.NewSettingsFromYAML("Zendesk", moduleConfig, globalConfig) + settings := zendesk.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) widget = zendesk.NewWidget(app, settings) default: settings := unknown.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) @@ -213,8 +214,9 @@ func MakeWidgets(app *tview.Application, pages *tview.Pages, config *config.Conf for mod := range mods { modConfig, _ := config.Get("wtf.mods." + mod) + widgetType := modConfig.UString("type", mod) if enabled := modConfig.UBool("enabled", false); enabled { - widget := MakeWidget(app, pages, mod, modConfig, config) + widget := MakeWidget(app, pages, mod, widgetType, modConfig, config) widgets = append(widgets, widget) } } diff --git a/modules/cmdrunner/settings.go b/modules/cmdrunner/settings.go index 267d6ea1..c1d38e66 100644 --- a/modules/cmdrunner/settings.go +++ b/modules/cmdrunner/settings.go @@ -15,13 +15,13 @@ type Settings struct { cmd string } -func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { +func NewSettingsFromYAML(name string, moduleConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, moduleConfig, globalConfig), - args: wtf.ToStrs(ymlConfig.UList("args")), - cmd: ymlConfig.UString("cmd"), + args: wtf.ToStrs(moduleConfig.UList("args")), + cmd: moduleConfig.UString("cmd"), } return &settings From 14abd422b2636bd21e29df8e7614d2bfdfea29a5 Mon Sep 17 00:00:00 2001 From: Sean Smith Date: Tue, 30 Apr 2019 23:29:18 -0400 Subject: [PATCH 2/2] Add default titles, to mimic original behavior Have the modules set their own titles If no title is specified, use this title, rather than default to name --- cfg/common_settings.go | 4 ++-- logger/log.go | 2 +- logger/settings.go | 4 ++-- modules/bamboohr/settings.go | 4 ++-- modules/bargraph/settings.go | 4 +++- modules/circleci/settings.go | 4 ++-- modules/clocks/{setting.go => settings.go} | 4 ++-- modules/cmdrunner/settings.go | 4 ++-- modules/cryptoexchanges/bittrex/settings.go | 4 ++-- modules/cryptoexchanges/blockfolio/settings.go | 4 ++-- modules/cryptoexchanges/blockfolio/widget.go | 2 +- modules/cryptoexchanges/cryptolive/price/settings.go | 4 ++-- modules/cryptoexchanges/cryptolive/settings.go | 4 ++-- modules/cryptoexchanges/cryptolive/toplist/settings.go | 4 ++-- modules/datadog/settings.go | 4 ++-- modules/gcal/settings.go | 4 ++-- modules/gerrit/settings.go | 4 ++-- modules/git/settings.go | 4 ++-- modules/github/settings.go | 4 ++-- modules/gitlab/settings.go | 4 ++-- modules/gitter/settings.go | 4 ++-- modules/gitter/widget.go | 2 ++ modules/gspreadsheets/settings.go | 4 ++-- modules/hackernews/settings.go | 4 ++-- modules/ipaddresses/ipapi/settings.go | 4 ++-- modules/ipaddresses/ipinfo/settings.go | 4 ++-- modules/jenkins/settings.go | 4 ++-- modules/jira/settings.go | 4 ++-- modules/mercurial/settings.go | 4 ++-- modules/nbascore/settings.go | 4 ++-- modules/newrelic/settings.go | 4 ++-- modules/opsgenie/settings.go | 4 ++-- modules/pagerduty/settings.go | 4 ++-- modules/power/settings.go | 4 ++-- modules/resourceusage/settings.go | 4 ++-- modules/rollbar/settings.go | 4 ++-- modules/security/settings.go | 4 ++-- modules/spotify/settings.go | 4 ++-- modules/spotifyweb/settings.go | 4 ++-- modules/status/settings.go | 4 ++-- modules/system/settings.go | 4 ++-- modules/textfile/settings.go | 4 ++-- modules/todo/settings.go | 4 ++-- modules/todoist/settings.go | 4 ++-- modules/travisci/settings.go | 4 ++-- modules/trello/settings.go | 4 ++-- modules/twitter/settings.go | 4 ++-- modules/unknown/settings.go | 4 ++-- modules/victorops/settings.go | 4 ++-- modules/victorops/widget.go | 1 + modules/weatherservices/prettyweather/settings.go | 4 ++-- modules/weatherservices/weather/settings.go | 4 ++-- modules/zendesk/settings.go | 4 ++-- 53 files changed, 104 insertions(+), 99 deletions(-) rename modules/clocks/{setting.go => settings.go} (87%) diff --git a/cfg/common_settings.go b/cfg/common_settings.go index 45e55e5d..342fcd41 100644 --- a/cfg/common_settings.go +++ b/cfg/common_settings.go @@ -61,7 +61,7 @@ type Common struct { focusChar int } -func NewCommonSettingsFromModule(name string, moduleConfig *config.Config, globalSettings *config.Config) *Common { +func NewCommonSettingsFromModule(name, defaultTitle string, moduleConfig *config.Config, globalSettings *config.Config) *Common { colorsConfig, _ := globalSettings.Get("wtf.colors") positionPath := "position" sigilsPath := "wtf.sigils" @@ -93,7 +93,7 @@ func NewCommonSettingsFromModule(name string, moduleConfig *config.Config, globa Enabled: moduleConfig.UBool("enabled", false), RefreshInterval: moduleConfig.UInt("refreshInterval", 300), - Title: moduleConfig.UString("title", name), + Title: moduleConfig.UString("title", defaultTitle), Config: moduleConfig, focusChar: moduleConfig.UInt("focusChar", -1), diff --git a/logger/log.go b/logger/log.go index c5d3fcb3..3e45aac8 100644 --- a/logger/log.go +++ b/logger/log.go @@ -59,7 +59,7 @@ func (widget *Widget) Refresh() { logLines := widget.tailFile() widget.app.QueueUpdateDraw(func() { - widget.View.SetTitle(widget.Name()) + widget.View.SetTitle(widget.CommonSettings.Title) widget.View.SetText(widget.contentFrom(logLines)) }) } diff --git a/logger/settings.go b/logger/settings.go index a970da8c..255c1b87 100644 --- a/logger/settings.go +++ b/logger/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "logger" +const defaultTitle = "Logger" type Settings struct { common *cfg.Common @@ -13,7 +13,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), } return &settings diff --git a/modules/bamboohr/settings.go b/modules/bamboohr/settings.go index 3d5ef0bd..bfbba87c 100644 --- a/modules/bamboohr/settings.go +++ b/modules/bamboohr/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "bamboohr" +const defaultTitle = "BambooHR" type Settings struct { common *cfg.Common @@ -19,7 +19,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_BAMBOO_HR_TOKEN")), subdomain: ymlConfig.UString("subdomain", os.Getenv("WTF_BAMBOO_HR_SUBDOMAIN")), diff --git a/modules/bargraph/settings.go b/modules/bargraph/settings.go index 12d5358e..56d1840a 100644 --- a/modules/bargraph/settings.go +++ b/modules/bargraph/settings.go @@ -5,13 +5,15 @@ import ( "github.com/wtfutil/wtf/cfg" ) +const defaultTitle = "Bargraph" + type Settings struct { common *cfg.Common } func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), } return &settings diff --git a/modules/circleci/settings.go b/modules/circleci/settings.go index cb2a8d6d..153300a5 100644 --- a/modules/circleci/settings.go +++ b/modules/circleci/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "circleci" +const defaultTitle = "CircleCI" type Settings struct { common *cfg.Common @@ -18,7 +18,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_CIRCLE_API_KEY")), } diff --git a/modules/clocks/setting.go b/modules/clocks/settings.go similarity index 87% rename from modules/clocks/setting.go rename to modules/clocks/settings.go index daaea641..0b7e8f51 100644 --- a/modules/clocks/setting.go +++ b/modules/clocks/settings.go @@ -6,7 +6,7 @@ import ( "github.com/wtfutil/wtf/wtf" ) -const configKey = "clocks" +const defaultTitle = "Clocks" type colors struct { rows struct { @@ -28,7 +28,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), dateFormat: ymlConfig.UString("dateFormat", wtf.SimpleDateFormat), timeFormat: ymlConfig.UString("timeFormat", wtf.SimpleTimeFormat), diff --git a/modules/cmdrunner/settings.go b/modules/cmdrunner/settings.go index c1d38e66..c6c12e1c 100644 --- a/modules/cmdrunner/settings.go +++ b/modules/cmdrunner/settings.go @@ -6,7 +6,7 @@ import ( "github.com/wtfutil/wtf/wtf" ) -const configKey = "cmdrunner" +const defaultTitle = "CmdRunner" type Settings struct { common *cfg.Common @@ -18,7 +18,7 @@ type Settings struct { func NewSettingsFromYAML(name string, moduleConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, moduleConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, moduleConfig, globalConfig), args: wtf.ToStrs(moduleConfig.UList("args")), cmd: moduleConfig.UString("cmd"), diff --git a/modules/cryptoexchanges/bittrex/settings.go b/modules/cryptoexchanges/bittrex/settings.go index a8a8087f..8b2115f0 100644 --- a/modules/cryptoexchanges/bittrex/settings.go +++ b/modules/cryptoexchanges/bittrex/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "bittrex" +const defaultTitle = "Bittrex" type colors struct { base struct { @@ -37,7 +37,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), } settings.colors.base.name = ymlConfig.UString("colors.base.name") diff --git a/modules/cryptoexchanges/blockfolio/settings.go b/modules/cryptoexchanges/blockfolio/settings.go index a802d1f8..26a7ad9d 100644 --- a/modules/cryptoexchanges/blockfolio/settings.go +++ b/modules/cryptoexchanges/blockfolio/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "blockfolio" +const defaultTitle = "Blockfolio" type colors struct { name string @@ -24,7 +24,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), deviceToken: ymlConfig.UString("device_token"), displayHoldings: ymlConfig.UBool("displayHoldings", true), diff --git a/modules/cryptoexchanges/blockfolio/widget.go b/modules/cryptoexchanges/blockfolio/widget.go index b1c75f1d..b1148607 100644 --- a/modules/cryptoexchanges/blockfolio/widget.go +++ b/modules/cryptoexchanges/blockfolio/widget.go @@ -42,7 +42,7 @@ func (widget *Widget) Refresh() { content := widget.contentFrom(positions) widget.app.QueueUpdateDraw(func() { - widget.View.SetTitle(" Blockfolio ") + widget.View.SetTitle(widget.CommonSettings.Title) widget.View.SetText(content) }) } diff --git a/modules/cryptoexchanges/cryptolive/price/settings.go b/modules/cryptoexchanges/cryptolive/price/settings.go index f085de8f..052d8c40 100644 --- a/modules/cryptoexchanges/cryptolive/price/settings.go +++ b/modules/cryptoexchanges/cryptolive/price/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "cryptolive" +const defaultTitle = "CryptoLive" type colors struct { from struct { @@ -43,7 +43,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), } settings.colors.from.name = ymlConfig.UString("colors.from.name") diff --git a/modules/cryptoexchanges/cryptolive/settings.go b/modules/cryptoexchanges/cryptolive/settings.go index d6c2495d..92c3fb94 100644 --- a/modules/cryptoexchanges/cryptolive/settings.go +++ b/modules/cryptoexchanges/cryptolive/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/modules/cryptoexchanges/cryptolive/toplist" ) -const configKey = "cryptolive" +const defaultTitle = "CryptolLive" type colors struct { from struct { @@ -48,7 +48,7 @@ func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *co top, _ := ymlConfig.Map("top") settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), currencies: currencies, top: top, diff --git a/modules/cryptoexchanges/cryptolive/toplist/settings.go b/modules/cryptoexchanges/cryptolive/toplist/settings.go index ab5ab312..c49ecba1 100644 --- a/modules/cryptoexchanges/cryptolive/toplist/settings.go +++ b/modules/cryptoexchanges/cryptolive/toplist/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "cryptolive" +const defaultTitle = "CryptoLive" type colors struct { from struct { @@ -45,7 +45,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), } settings.colors.from.name = ymlConfig.UString("colors.from.name") diff --git a/modules/datadog/settings.go b/modules/datadog/settings.go index af561379..de6ca75c 100644 --- a/modules/datadog/settings.go +++ b/modules/datadog/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "datadog" +const defaultTitle = "DataDog" type Settings struct { common *cfg.Common @@ -20,7 +20,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_DATADOG_API_KEY")), applicationKey: ymlConfig.UString("applicationKey", os.Getenv("WTF_DATADOG_APPLICATION_KEY")), diff --git a/modules/gcal/settings.go b/modules/gcal/settings.go index b00bdac1..cda88686 100644 --- a/modules/gcal/settings.go +++ b/modules/gcal/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "gcal" +const defaultTitle = "Calendar" type colors struct { day string @@ -35,7 +35,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), conflictIcon: ymlConfig.UString("conflictIcon", "🚨"), currentIcon: ymlConfig.UString("currentIcon", "🔸"), diff --git a/modules/gerrit/settings.go b/modules/gerrit/settings.go index 9253a56e..33cb84db 100644 --- a/modules/gerrit/settings.go +++ b/modules/gerrit/settings.go @@ -14,7 +14,7 @@ type colors struct { } } -const configKey = "gerrit" +const defaultTitle = "Gerrit" type Settings struct { colors @@ -30,7 +30,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), domain: ymlConfig.UString("domain", ""), password: ymlConfig.UString("password", os.Getenv("WTF_GERRIT_PASSWORD")), diff --git a/modules/git/settings.go b/modules/git/settings.go index 0d7f36ca..e71f970e 100644 --- a/modules/git/settings.go +++ b/modules/git/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "git" +const defaultTitle = "Git" type Settings struct { common *cfg.Common @@ -19,7 +19,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), commitCount: ymlConfig.UInt("commitCount", 10), commitFormat: ymlConfig.UString("commitFormat", "[forestgreen]%h [white]%s [grey]%an on %cd[white]"), diff --git a/modules/github/settings.go b/modules/github/settings.go index 1e9aa19b..125c6fa7 100644 --- a/modules/github/settings.go +++ b/modules/github/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "github" +const defaultTitle = "GitHub" type Settings struct { common *cfg.Common @@ -23,7 +23,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_GITHUB_TOKEN")), baseURL: ymlConfig.UString("baseURL", os.Getenv("WTF_GITHUB_BASE_URL")), diff --git a/modules/gitlab/settings.go b/modules/gitlab/settings.go index 64c05234..970f8f77 100644 --- a/modules/gitlab/settings.go +++ b/modules/gitlab/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "gitlab" +const defaultTitle = "GitLab" type Settings struct { common *cfg.Common @@ -21,7 +21,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_GITLAB_TOKEN")), domain: ymlConfig.UString("domain"), diff --git a/modules/gitter/settings.go b/modules/gitter/settings.go index 37431dc3..3bb70255 100644 --- a/modules/gitter/settings.go +++ b/modules/gitter/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "gitter" +const defaultTitle = "Gitter" type Settings struct { common *cfg.Common @@ -20,7 +20,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), apiToken: ymlConfig.UString("apiToken", os.Getenv("WTF_GITTER_API_TOKEN")), numberOfMessages: ymlConfig.UInt("numberOfMessages", 10), diff --git a/modules/gitter/widget.go b/modules/gitter/widget.go index e189cd98..c159cda6 100644 --- a/modules/gitter/widget.go +++ b/modules/gitter/widget.go @@ -59,6 +59,7 @@ func (widget *Widget) Refresh() { room, err := GetRoom(widget.settings.roomURI, widget.settings.apiToken) if err != nil { widget.View.SetWrap(true) + widget.View.SetTitle(widget.CommonSettings.Title) widget.View.SetText(err.Error()) return } @@ -73,6 +74,7 @@ func (widget *Widget) Refresh() { widget.View.SetWrap(true) widget.app.QueueUpdateDraw(func() { + widget.View.SetTitle(widget.CommonSettings.Title) widget.View.SetText(err.Error()) }) } else { diff --git a/modules/gspreadsheets/settings.go b/modules/gspreadsheets/settings.go index e852693b..ebad7df9 100644 --- a/modules/gspreadsheets/settings.go +++ b/modules/gspreadsheets/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "gspreadsheets" +const defaultTitle = "Google Spreadsheets" type colors struct { values string @@ -24,7 +24,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), cellNames: ymlConfig.UList("cells.names"), secretFile: ymlConfig.UString("secretFile"), diff --git a/modules/hackernews/settings.go b/modules/hackernews/settings.go index 55106b3b..e4af6714 100644 --- a/modules/hackernews/settings.go +++ b/modules/hackernews/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "hackernews" +const defaultTitle = "HackerNews" type Settings struct { common *cfg.Common @@ -17,7 +17,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), numberOfStories: ymlConfig.UInt("numberOfStories", 10), storyType: ymlConfig.UString("storyType", "top"), diff --git a/modules/ipaddresses/ipapi/settings.go b/modules/ipaddresses/ipapi/settings.go index 03da3302..8cb97c43 100644 --- a/modules/ipaddresses/ipapi/settings.go +++ b/modules/ipaddresses/ipapi/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "ipapi" +const defaultTitle = "IP API" type colors struct { name string @@ -20,7 +20,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), } settings.colors.name = ymlConfig.UString("colors.name", "red") diff --git a/modules/ipaddresses/ipinfo/settings.go b/modules/ipaddresses/ipinfo/settings.go index afb7b5d5..a19bfc33 100644 --- a/modules/ipaddresses/ipinfo/settings.go +++ b/modules/ipaddresses/ipinfo/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "ipinfo" +const defaultTitle = "IPInfo" type colors struct { name string @@ -20,7 +20,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), } settings.colors.name = ymlConfig.UString("colors.name", "red") diff --git a/modules/jenkins/settings.go b/modules/jenkins/settings.go index 27bfd290..7669c7fb 100644 --- a/modules/jenkins/settings.go +++ b/modules/jenkins/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "jenkins" +const defaultTitle = "Jenkins" type Settings struct { common *cfg.Common @@ -23,7 +23,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_JENKINS_API_KEY")), jobNameRegex: ymlConfig.UString("jobNameRegex", ".*"), diff --git a/modules/jira/settings.go b/modules/jira/settings.go index c672f5fd..2fc176bf 100644 --- a/modules/jira/settings.go +++ b/modules/jira/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "jira" +const defaultTitle = "Jira" type colors struct { rows struct { @@ -32,7 +32,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_JIRA_API_KEY")), domain: ymlConfig.UString("domain"), diff --git a/modules/mercurial/settings.go b/modules/mercurial/settings.go index 6f1ed00e..354fd6b7 100644 --- a/modules/mercurial/settings.go +++ b/modules/mercurial/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "mercurial" +const defaultTitle = "Mercurial" type Settings struct { common *cfg.Common @@ -18,7 +18,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), commitCount: ymlConfig.UInt("commitCount", 10), commitFormat: ymlConfig.UString("commitFormat", "[forestgreen]{rev}:{phase} [white]{desc|firstline|strip} [grey]{author|person} {date|age}[white]"), diff --git a/modules/nbascore/settings.go b/modules/nbascore/settings.go index ca222927..46ac6f28 100644 --- a/modules/nbascore/settings.go +++ b/modules/nbascore/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "nbascore" +const defaultTitle = "NBA Score" type Settings struct { common *cfg.Common @@ -13,7 +13,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), } return &settings diff --git a/modules/newrelic/settings.go b/modules/newrelic/settings.go index 785493b3..7c72d3b8 100644 --- a/modules/newrelic/settings.go +++ b/modules/newrelic/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "newrelic" +const defaultTitle = "NewRelic" type Settings struct { common *cfg.Common @@ -20,7 +20,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_NEW_RELIC_API_KEY")), applicationID: ymlConfig.UInt("applicationID"), diff --git a/modules/opsgenie/settings.go b/modules/opsgenie/settings.go index 48a6b060..0012e02a 100644 --- a/modules/opsgenie/settings.go +++ b/modules/opsgenie/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "opsgenie" +const defaultTitle = "OpsGenie" type Settings struct { common *cfg.Common @@ -21,7 +21,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_OPS_GENIE_API_KEY")), displayEmpty: ymlConfig.UBool("displayEmpty", true), diff --git a/modules/pagerduty/settings.go b/modules/pagerduty/settings.go index a003196c..b98bb923 100644 --- a/modules/pagerduty/settings.go +++ b/modules/pagerduty/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "pagerduty" +const defaultTitle = "PagerDuty" type Settings struct { common *cfg.Common @@ -21,7 +21,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_PAGERDUTY_API_KEY")), escalationFilter: ymlConfig.UList("escalationFilter"), diff --git a/modules/power/settings.go b/modules/power/settings.go index acfe5c93..eb61bd7b 100644 --- a/modules/power/settings.go +++ b/modules/power/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "power" +const defaultTitle = "Power" type Settings struct { common *cfg.Common @@ -15,7 +15,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), } return &settings diff --git a/modules/resourceusage/settings.go b/modules/resourceusage/settings.go index a9dbbe6c..bcdb813c 100644 --- a/modules/resourceusage/settings.go +++ b/modules/resourceusage/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "resourceusage" +const defaultTitle = "ResourceUsage" type Settings struct { common *cfg.Common @@ -13,7 +13,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), } return &settings diff --git a/modules/rollbar/settings.go b/modules/rollbar/settings.go index 884a47f2..0c94dfe7 100644 --- a/modules/rollbar/settings.go +++ b/modules/rollbar/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "rollbar" +const defaultTitle = "Rollbar" type Settings struct { common *cfg.Common @@ -21,7 +21,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), accessToken: ymlConfig.UString("accessToken"), activeOnly: ymlConfig.UBool("activeOnly", false), diff --git a/modules/security/settings.go b/modules/security/settings.go index 7988690d..690103db 100644 --- a/modules/security/settings.go +++ b/modules/security/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "security" +const defaultTitle = "Security" type Settings struct { common *cfg.Common @@ -13,7 +13,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), } return &settings diff --git a/modules/spotify/settings.go b/modules/spotify/settings.go index cafd5df9..081fb9a6 100644 --- a/modules/spotify/settings.go +++ b/modules/spotify/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "spotify" +const defaultTitle = "Spotify" type Settings struct { common *cfg.Common @@ -13,7 +13,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), } return &settings diff --git a/modules/spotifyweb/settings.go b/modules/spotifyweb/settings.go index 78c14288..60616689 100644 --- a/modules/spotifyweb/settings.go +++ b/modules/spotifyweb/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "spotifyweb" +const defaultTitle = "Spotify Web" type Settings struct { common *cfg.Common @@ -20,7 +20,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), callbackPort: ymlConfig.UString("callbackPort", "8080"), clientID: ymlConfig.UString("clientID", os.Getenv("SPOTIFY_ID")), diff --git a/modules/status/settings.go b/modules/status/settings.go index 82252e00..be058893 100644 --- a/modules/status/settings.go +++ b/modules/status/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "status" +const defaultTitle = "Status" type Settings struct { common *cfg.Common @@ -13,7 +13,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), } return &settings diff --git a/modules/system/settings.go b/modules/system/settings.go index 3650f553..0985ee7d 100644 --- a/modules/system/settings.go +++ b/modules/system/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "system" +const defaultTitle = "System" type Settings struct { common *cfg.Common @@ -13,7 +13,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), } return &settings diff --git a/modules/textfile/settings.go b/modules/textfile/settings.go index 977bb86f..4e3e4290 100644 --- a/modules/textfile/settings.go +++ b/modules/textfile/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "textfile" +const defaultTitle = "Textfile" type Settings struct { common *cfg.Common @@ -18,7 +18,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), filePaths: ymlConfig.UList("filePaths"), format: ymlConfig.UBool("format", false), diff --git a/modules/todo/settings.go b/modules/todo/settings.go index 0365d888..b603199d 100644 --- a/modules/todo/settings.go +++ b/modules/todo/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "todo" +const defaultTitle = "Todo" type Settings struct { common *cfg.Common @@ -16,7 +16,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), filePath: ymlConfig.UString("filename"), } diff --git a/modules/todoist/settings.go b/modules/todoist/settings.go index 88985798..21fb06fd 100644 --- a/modules/todoist/settings.go +++ b/modules/todoist/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "todoist" +const defaultTitle = "Todoist" type Settings struct { common *cfg.Common @@ -19,7 +19,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_TODOIST_TOKEN")), projects: ymlConfig.UList("projects"), diff --git a/modules/travisci/settings.go b/modules/travisci/settings.go index 2989318e..a89c1a52 100644 --- a/modules/travisci/settings.go +++ b/modules/travisci/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "travisci" +const defaultTitle = "TravisCI" type Settings struct { common *cfg.Common @@ -19,7 +19,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_TRAVIS_API_TOKEN")), pro: ymlConfig.UBool("pro", false), diff --git a/modules/trello/settings.go b/modules/trello/settings.go index 8d90ce46..fe3f49b2 100644 --- a/modules/trello/settings.go +++ b/modules/trello/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "trello" +const defaultTitle = "Trello" type Settings struct { common *cfg.Common @@ -22,7 +22,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), accessToken: ymlConfig.UString("accessToken", os.Getenv("WTF_TRELLO_ACCESS_TOKEN")), apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_TRELLO_APP_KEY")), diff --git a/modules/twitter/settings.go b/modules/twitter/settings.go index 3327cd5f..096d353f 100644 --- a/modules/twitter/settings.go +++ b/modules/twitter/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "twitter" +const defaultTitle = "Twitter" type Settings struct { common *cfg.Common @@ -20,7 +20,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), bearerToken: ymlConfig.UString("bearerToken", os.Getenv("WTF_TWITTER_BEARER_TOKEN")), count: ymlConfig.UInt("count", 5), diff --git a/modules/unknown/settings.go b/modules/unknown/settings.go index 166afe2d..b622d2f6 100644 --- a/modules/unknown/settings.go +++ b/modules/unknown/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "unkown" +const defaultTitle = "Unknown" type Settings struct { common *cfg.Common @@ -13,7 +13,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), } return &settings diff --git a/modules/victorops/settings.go b/modules/victorops/settings.go index 6caf4bf2..efa88635 100644 --- a/modules/victorops/settings.go +++ b/modules/victorops/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "victorops" +const defaultTitle = "VictorOps" type Settings struct { common *cfg.Common @@ -20,7 +20,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), apiID: ymlConfig.UString("apiID", os.Getenv("WTF_VICTOROPS_API_ID")), apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_VICTOROPS_API_KEY")), diff --git a/modules/victorops/widget.go b/modules/victorops/widget.go index f39ee6df..cc57118a 100644 --- a/modules/victorops/widget.go +++ b/modules/victorops/widget.go @@ -44,6 +44,7 @@ func (widget *Widget) Refresh() { } teams, err := Fetch(widget.settings.apiID, widget.settings.apiKey) + widget.View.SetTitle(widget.ContextualTitle(widget.CommonSettings.Title)) if err != nil { widget.View.SetWrap(true) diff --git a/modules/weatherservices/prettyweather/settings.go b/modules/weatherservices/prettyweather/settings.go index 28fb3baf..81ee8ad4 100644 --- a/modules/weatherservices/prettyweather/settings.go +++ b/modules/weatherservices/prettyweather/settings.go @@ -5,7 +5,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "prettyweather" +const defaultTitle = "Pretty Weather" type Settings struct { common *cfg.Common @@ -19,7 +19,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), city: ymlConfig.UString("city", "Barcelona"), language: ymlConfig.UString("language", "en"), diff --git a/modules/weatherservices/weather/settings.go b/modules/weatherservices/weather/settings.go index 08619b42..8caaedb8 100644 --- a/modules/weatherservices/weather/settings.go +++ b/modules/weatherservices/weather/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "weather" +const defaultTitle = "Weather" type colors struct { current string @@ -26,7 +26,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_OWM_API_KEY")), cityIDs: ymlConfig.UList("cityids"), diff --git a/modules/zendesk/settings.go b/modules/zendesk/settings.go index 77097843..90adef2c 100644 --- a/modules/zendesk/settings.go +++ b/modules/zendesk/settings.go @@ -7,7 +7,7 @@ import ( "github.com/wtfutil/wtf/cfg" ) -const configKey = "zendesk" +const defaultTitle = "Zendesk" type Settings struct { common *cfg.Common @@ -21,7 +21,7 @@ type Settings struct { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { settings := Settings{ - common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), + common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), apiKey: ymlConfig.UString("apiKey", os.Getenv("ZENDESK_API")), status: ymlConfig.UString("status"),