taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Clean up the MakeWidgets process by miniming the number of params passed around

Browse Source
This commit is contained in:
Chris Cummer 2019-07-26 21:45:21 -07:00
parent 6de0449b8c
commit 324666a3ec
5 changed files with 72 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
help/help.go
View File

@ -18,8 +18,7 @@ func Display(moduleName string, config *config.Config) {
} }
func helpFor(moduleName string, config *config.Config) string { func helpFor(moduleName string, config *config.Config) string {
modConfig, _ := config.Get("wtf.mods." + moduleName) widget := maker.MakeWidget(nil, nil, moduleName, config)
widget := maker.MakeWidget(nil, nil, moduleName, moduleName, modConfig, config)
result := "" result := ""
result += utils.StripColorTags(widget.HelpText()) result += utils.StripColorTags(widget.HelpText())

4
main.go
View File

@ -154,8 +154,6 @@ func main() {
setTerm(config) setTerm(config)
wtf.OpenFileUtil = config.UString("wtf.openFileUtil", "open")
app := tview.NewApplication() app := tview.NewApplication()
pages := tview.NewPages() pages := tview.NewPages()
@ -173,6 +171,8 @@ func main() {
go watchForConfigChanges(app, flags.Config, flags.HasCustomConfig(), display.Grid, pages) go watchForConfigChanges(app, flags.Config, flags.HasCustomConfig(), display.Grid, pages)
wtf.Init(config.UString("wtf.openFileUtil", "open"))
if err := app.SetRoot(pages, true).Run(); err != nil { if err := app.SetRoot(pages, true).Run(); err != nil {
fmt.Printf("\n%s %v\n", aurora.Red("ERROR"), err) fmt.Printf("\n%s %v\n", aurora.Red("ERROR"), err)
os.Exit(1) os.Exit(1)

124
maker/widget_maker.go
View File

@ -55,181 +55,185 @@ import (
"github.com/wtfutil/wtf/wtf" "github.com/wtfutil/wtf/wtf"
) )
// MakeWidget creates and returns instances of widgets
func MakeWidget( func MakeWidget(
app *tview.Application, app *tview.Application,
pages *tview.Pages, pages *tview.Pages,
widgetName string, moduleName string,
widgetType string, config *config.Config,
moduleConfig *config.Config,
globalConfig *config.Config,
) wtf.Wtfable { ) wtf.Wtfable {
var widget wtf.Wtfable var widget wtf.Wtfable
moduleConfig, _ := config.Get("wtf.mods." + moduleName)
if enabled := moduleConfig.UBool("enabled", false); !enabled {
// Don't initialize modules that aren't enabled
return nil
}
// Always in alphabetical order // Always in alphabetical order
switch widgetType { switch moduleConfig.UString("type", moduleName) {
case "bamboohr": case "bamboohr":
settings := bamboohr.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := bamboohr.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = bamboohr.NewWidget(app, settings) widget = bamboohr.NewWidget(app, settings)
case "bargraph": case "bargraph":
settings := bargraph.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := bargraph.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = bargraph.NewWidget(app, settings) widget = bargraph.NewWidget(app, settings)
case "bittrex": case "bittrex":
settings := bittrex.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := bittrex.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = bittrex.NewWidget(app, settings) widget = bittrex.NewWidget(app, settings)
case "blockfolio": case "blockfolio":
settings := blockfolio.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := blockfolio.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = blockfolio.NewWidget(app, settings) widget = blockfolio.NewWidget(app, settings)
case "circleci": case "circleci":
settings := circleci.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := circleci.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = circleci.NewWidget(app, settings) widget = circleci.NewWidget(app, settings)
case "clocks": case "clocks":
settings := clocks.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := clocks.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = clocks.NewWidget(app, settings) widget = clocks.NewWidget(app, settings)
case "cmdrunner": case "cmdrunner":
settings := cmdrunner.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := cmdrunner.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = cmdrunner.NewWidget(app, settings) widget = cmdrunner.NewWidget(app, settings)
case "cryptolive": case "cryptolive":
settings := cryptolive.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := cryptolive.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = cryptolive.NewWidget(app, settings) widget = cryptolive.NewWidget(app, settings)
case "datadog": case "datadog":
settings := datadog.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := datadog.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = datadog.NewWidget(app, pages, settings) widget = datadog.NewWidget(app, pages, settings)
case "feedreader": case "feedreader":
settings := feedreader.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := feedreader.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = feedreader.NewWidget(app, pages, settings) widget = feedreader.NewWidget(app, pages, settings)
case "gcal": case "gcal":
settings := gcal.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := gcal.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = gcal.NewWidget(app, settings) widget = gcal.NewWidget(app, settings)
case "gerrit": case "gerrit":
settings := gerrit.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := gerrit.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = gerrit.NewWidget(app, pages, settings) widget = gerrit.NewWidget(app, pages, settings)
case "git": case "git":
settings := git.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := git.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = git.NewWidget(app, pages, settings) widget = git.NewWidget(app, pages, settings)
case "github": case "github":
settings := github.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := github.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = github.NewWidget(app, pages, settings) widget = github.NewWidget(app, pages, settings)
case "gitlab": case "gitlab":
settings := gitlab.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := gitlab.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = gitlab.NewWidget(app, pages, settings) widget = gitlab.NewWidget(app, pages, settings)
case "gitter": case "gitter":
settings := gitter.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := gitter.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = gitter.NewWidget(app, pages, settings) widget = gitter.NewWidget(app, pages, settings)
case "googleanalytics": case "googleanalytics":
settings := googleanalytics.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := googleanalytics.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = googleanalytics.NewWidget(app, settings) widget = googleanalytics.NewWidget(app, settings)
case "gspreadsheets": case "gspreadsheets":
settings := gspreadsheets.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := gspreadsheets.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = gspreadsheets.NewWidget(app, settings) widget = gspreadsheets.NewWidget(app, settings)
case "hackernews": case "hackernews":
settings := hackernews.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := hackernews.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = hackernews.NewWidget(app, pages, settings) widget = hackernews.NewWidget(app, pages, settings)
case "hibp": case "hibp":
settings := hibp.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := hibp.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = hibp.NewWidget(app, settings) widget = hibp.NewWidget(app, settings)
case "ipapi": case "ipapi":
settings := ipapi.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := ipapi.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = ipapi.NewWidget(app, settings) widget = ipapi.NewWidget(app, settings)
case "ipinfo": case "ipinfo":
settings := ipinfo.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := ipinfo.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = ipinfo.NewWidget(app, settings) widget = ipinfo.NewWidget(app, settings)
case "jenkins": case "jenkins":
settings := jenkins.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := jenkins.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = jenkins.NewWidget(app, pages, settings) widget = jenkins.NewWidget(app, pages, settings)
case "jira": case "jira":
settings := jira.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := jira.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = jira.NewWidget(app, pages, settings) widget = jira.NewWidget(app, pages, settings)
case "logger": case "logger":
settings := logger.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := logger.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = logger.NewWidget(app, settings) widget = logger.NewWidget(app, settings)
case "mercurial": case "mercurial":
settings := mercurial.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := mercurial.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = mercurial.NewWidget(app, pages, settings) widget = mercurial.NewWidget(app, pages, settings)
case "nbascore": case "nbascore":
settings := nbascore.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := nbascore.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = nbascore.NewWidget(app, pages, settings) widget = nbascore.NewWidget(app, pages, settings)
case "newrelic": case "newrelic":
settings := newrelic.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := newrelic.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = newrelic.NewWidget(app, settings) widget = newrelic.NewWidget(app, settings)
case "opsgenie": case "opsgenie":
settings := opsgenie.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := opsgenie.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = opsgenie.NewWidget(app, settings) widget = opsgenie.NewWidget(app, settings)
case "pagerduty": case "pagerduty":
settings := pagerduty.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := pagerduty.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = pagerduty.NewWidget(app, settings) widget = pagerduty.NewWidget(app, settings)
case "power": case "power":
settings := power.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := power.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = power.NewWidget(app, settings) widget = power.NewWidget(app, settings)
case "prettyweather": case "prettyweather":
settings := prettyweather.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := prettyweather.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = prettyweather.NewWidget(app, settings) widget = prettyweather.NewWidget(app, settings)
case "resourceusage": case "resourceusage":
settings := resourceusage.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := resourceusage.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = resourceusage.NewWidget(app, settings) widget = resourceusage.NewWidget(app, settings)
case "rollbar": case "rollbar":
settings := rollbar.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := rollbar.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = rollbar.NewWidget(app, pages, settings) widget = rollbar.NewWidget(app, pages, settings)
case "security": case "security":
settings := security.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := security.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = security.NewWidget(app, settings) widget = security.NewWidget(app, settings)
case "spotify": case "spotify":
settings := spotify.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := spotify.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = spotify.NewWidget(app, pages, settings) widget = spotify.NewWidget(app, pages, settings)
case "spotifyweb": case "spotifyweb":
settings := spotifyweb.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := spotifyweb.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = spotifyweb.NewWidget(app, pages, settings) widget = spotifyweb.NewWidget(app, pages, settings)
case "status": case "status":
settings := status.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := status.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = status.NewWidget(app, settings) widget = status.NewWidget(app, settings)
case "textfile": case "textfile":
settings := textfile.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := textfile.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = textfile.NewWidget(app, pages, settings) widget = textfile.NewWidget(app, pages, settings)
case "todo": case "todo":
settings := todo.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := todo.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = todo.NewWidget(app, pages, settings) widget = todo.NewWidget(app, pages, settings)
case "todoist": case "todoist":
settings := todoist.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := todoist.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = todoist.NewWidget(app, pages, settings) widget = todoist.NewWidget(app, pages, settings)
case "transmission": case "transmission":
settings := transmission.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := transmission.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = transmission.NewWidget(app, pages, settings) widget = transmission.NewWidget(app, pages, settings)
case "travisci": case "travisci":
settings := travisci.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := travisci.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = travisci.NewWidget(app, pages, settings) widget = travisci.NewWidget(app, pages, settings)
case "trello": case "trello":
settings := trello.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := trello.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = trello.NewWidget(app, settings) widget = trello.NewWidget(app, settings)
case "twitter": case "twitter":
settings := twitter.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := twitter.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = twitter.NewWidget(app, pages, settings) widget = twitter.NewWidget(app, pages, settings)
case "victorops": case "victorops":
settings := victorops.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := victorops.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = victorops.NewWidget(app, settings) widget = victorops.NewWidget(app, settings)
case "weather": case "weather":
settings := weather.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := weather.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = weather.NewWidget(app, pages, settings) widget = weather.NewWidget(app, pages, settings)
case "zendesk": case "zendesk":
settings := zendesk.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := zendesk.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = zendesk.NewWidget(app, pages, settings) widget = zendesk.NewWidget(app, pages, settings)
default: default:
settings := unknown.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := unknown.NewSettingsFromYAML(moduleName, moduleConfig, config)
widget = unknown.NewWidget(app, settings) widget = unknown.NewWidget(app, settings)
} }
return widget return widget
} }
// MakeWidgets creates and returns a collection of enabled widgets
func MakeWidgets(app *tview.Application, pages *tview.Pages, config *config.Config) []wtf.Wtfable { func MakeWidgets(app *tview.Application, pages *tview.Pages, config *config.Config) []wtf.Wtfable {
widgets := []wtf.Wtfable{} widgets := []wtf.Wtfable{}
mods, _ := config.Map("wtf.mods") moduleNames, _ := config.Map("wtf.mods")
for mod := range mods { for moduleName := range moduleNames {
modConfig, _ := config.Get("wtf.mods." + mod) widget := MakeWidget(app, pages, moduleName, config)
widgetType := modConfig.UString("type", mod)
if enabled := modConfig.UBool("enabled", false); enabled { if widget != nil {
widget := MakeWidget(app, pages, mod, widgetType, modConfig, config)
widgets = append(widgets, widget) widgets = append(widgets, widget)
} }
} }

1
modules/bamboohr/settings.go
View File

@ -17,7 +17,6 @@ type Settings struct {
} }
func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
settings := Settings{ settings := Settings{
common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig), common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig),

5
wtf/utils.go
View File

@ -23,6 +23,11 @@ const TimestampFormat = "2006-01-02T15:04:05-0700"
var OpenFileUtil = "open" var OpenFileUtil = "open"
// Init initializes global settings in the wtf package
func Init(openFileUtil string) {
OpenFileUtil = openFileUtil
}
// CenterText takes a string and a width and pads the left and right of the string with // CenterText takes a string and a width and pads the left and right of the string with
// empty spaces to ensure that the string is in the middle of the returned value // empty spaces to ensure that the string is in the middle of the returned value
// //