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

Allow duplicates of modules

Browse Source 
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
This commit is contained in:
Sean Smith 2019-04-27 12:15:55 -04:00
parent 378cce8726
commit 3a96c303a8
2 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
maker/widget_maker.go
View File

@ -56,147 +56,148 @@ func MakeWidget(
app *tview.Application, app *tview.Application,
pages *tview.Pages, pages *tview.Pages,
widgetName string, widgetName string,
widgetType string,
moduleConfig *config.Config, moduleConfig *config.Config,
globalConfig *config.Config, globalConfig *config.Config,
) wtf.Wtfable { ) wtf.Wtfable {
var widget wtf.Wtfable var widget wtf.Wtfable
// Always in alphabetical order // Always in alphabetical order
switch widgetName { switch widgetType {
case "bamboohr": case "bamboohr":
settings := bamboohr.NewSettingsFromYAML("BambooHR", moduleConfig, globalConfig) settings := bamboohr.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = bamboohr.NewWidget(app, settings) widget = bamboohr.NewWidget(app, settings)
case "bargraph": case "bargraph":
settings := bargraph.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) settings := bargraph.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = bargraph.NewWidget(app, settings) widget = bargraph.NewWidget(app, settings)
case "bittrex": case "bittrex":
settings := bittrex.NewSettingsFromYAML("Bittrex", moduleConfig, globalConfig) settings := bittrex.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = bittrex.NewWidget(app, settings) widget = bittrex.NewWidget(app, settings)
case "blockfolio": case "blockfolio":
settings := blockfolio.NewSettingsFromYAML("Blockfolio", moduleConfig, globalConfig) settings := blockfolio.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = blockfolio.NewWidget(app, settings) widget = blockfolio.NewWidget(app, settings)
case "circleci": case "circleci":
settings := circleci.NewSettingsFromYAML("CircleCI", moduleConfig, globalConfig) settings := circleci.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = circleci.NewWidget(app, settings) widget = circleci.NewWidget(app, settings)
case "clocks": case "clocks":
settings := clocks.NewSettingsFromYAML("Clocks", moduleConfig, globalConfig) settings := clocks.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = clocks.NewWidget(app, settings) widget = clocks.NewWidget(app, settings)
case "cmdrunner": case "cmdrunner":
settings := cmdrunner.NewSettingsFromYAML("CmdRunner", moduleConfig, globalConfig) settings := cmdrunner.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = cmdrunner.NewWidget(app, settings) widget = cmdrunner.NewWidget(app, settings)
case "cryptolive": case "cryptolive":
settings := cryptolive.NewSettingsFromYAML("CryptoLive", moduleConfig, globalConfig) settings := cryptolive.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = cryptolive.NewWidget(app, settings) widget = cryptolive.NewWidget(app, settings)
case "datadog": case "datadog":
settings := datadog.NewSettingsFromYAML("DataDog", moduleConfig, globalConfig) settings := datadog.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = datadog.NewWidget(app, settings) widget = datadog.NewWidget(app, settings)
case "gcal": case "gcal":
settings := gcal.NewSettingsFromYAML("Calendar", moduleConfig, globalConfig) settings := gcal.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = gcal.NewWidget(app, settings) widget = gcal.NewWidget(app, settings)
case "gerrit": case "gerrit":
settings := gerrit.NewSettingsFromYAML("Gerrit", moduleConfig, globalConfig) settings := gerrit.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = gerrit.NewWidget(app, pages, settings) widget = gerrit.NewWidget(app, pages, settings)
case "git": case "git":
settings := git.NewSettingsFromYAML("Git", moduleConfig, globalConfig) settings := git.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = git.NewWidget(app, pages, settings) widget = git.NewWidget(app, pages, settings)
case "github": case "github":
settings := github.NewSettingsFromYAML("GitHub", moduleConfig, globalConfig) settings := github.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = github.NewWidget(app, pages, settings) widget = github.NewWidget(app, pages, settings)
case "gitlab": case "gitlab":
settings := gitlab.NewSettingsFromYAML("GitLab", moduleConfig, globalConfig) settings := gitlab.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = gitlab.NewWidget(app, pages, settings) widget = gitlab.NewWidget(app, pages, settings)
case "gitter": case "gitter":
settings := gitter.NewSettingsFromYAML("Gitter", moduleConfig, globalConfig) settings := gitter.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = gitter.NewWidget(app, pages, settings) widget = gitter.NewWidget(app, pages, settings)
case "gspreadsheets": case "gspreadsheets":
settings := gspreadsheets.NewSettingsFromYAML("Google Spreadsheets", moduleConfig, globalConfig) settings := gspreadsheets.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = gspreadsheets.NewWidget(app, settings) widget = gspreadsheets.NewWidget(app, settings)
case "hackernews": case "hackernews":
settings := hackernews.NewSettingsFromYAML("HackerNews", moduleConfig, globalConfig) settings := hackernews.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = hackernews.NewWidget(app, pages, settings) widget = hackernews.NewWidget(app, pages, settings)
case "ipapi": case "ipapi":
settings := ipapi.NewSettingsFromYAML("IPAPI", moduleConfig, globalConfig) settings := ipapi.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = ipapi.NewWidget(app, settings) widget = ipapi.NewWidget(app, settings)
case "ipinfo": case "ipinfo":
settings := ipinfo.NewSettingsFromYAML("IPInfo", moduleConfig, globalConfig) settings := ipinfo.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = ipinfo.NewWidget(app, settings) widget = ipinfo.NewWidget(app, settings)
case "jenkins": case "jenkins":
settings := jenkins.NewSettingsFromYAML("Jenkins", moduleConfig, globalConfig) settings := jenkins.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = jenkins.NewWidget(app, pages, settings) widget = jenkins.NewWidget(app, pages, settings)
case "jira": case "jira":
settings := jira.NewSettingsFromYAML("Jira", moduleConfig, globalConfig) settings := jira.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = jira.NewWidget(app, pages, settings) widget = jira.NewWidget(app, pages, settings)
case "logger": case "logger":
settings := logger.NewSettingsFromYAML("Log", moduleConfig, globalConfig) settings := logger.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = logger.NewWidget(app, settings) widget = logger.NewWidget(app, settings)
case "mercurial": case "mercurial":
settings := mercurial.NewSettingsFromYAML("Mercurial", moduleConfig, globalConfig) settings := mercurial.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = mercurial.NewWidget(app, pages, settings) widget = mercurial.NewWidget(app, pages, settings)
case "nbascore": case "nbascore":
settings := nbascore.NewSettingsFromYAML("NBA Score", moduleConfig, globalConfig) settings := nbascore.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = nbascore.NewWidget(app, pages, settings) widget = nbascore.NewWidget(app, pages, settings)
case "newrelic": case "newrelic":
settings := newrelic.NewSettingsFromYAML("NewRelic", moduleConfig, globalConfig) settings := newrelic.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = newrelic.NewWidget(app, settings) widget = newrelic.NewWidget(app, settings)
case "opsgenie": case "opsgenie":
settings := opsgenie.NewSettingsFromYAML("OpsGenie", moduleConfig, globalConfig) settings := opsgenie.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = opsgenie.NewWidget(app, settings) widget = opsgenie.NewWidget(app, settings)
case "pagerduty": case "pagerduty":
settings := pagerduty.NewSettingsFromYAML("PagerDuty", moduleConfig, globalConfig) settings := pagerduty.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = pagerduty.NewWidget(app, settings) widget = pagerduty.NewWidget(app, settings)
case "power": case "power":
settings := power.NewSettingsFromYAML("Power", moduleConfig, globalConfig) settings := power.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = power.NewWidget(app, settings) widget = power.NewWidget(app, settings)
case "prettyweather": case "prettyweather":
settings := prettyweather.NewSettingsFromYAML("Pretty Weather", moduleConfig, globalConfig) settings := prettyweather.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = prettyweather.NewWidget(app, settings) widget = prettyweather.NewWidget(app, settings)
case "resourceusage": case "resourceusage":
settings := resourceusage.NewSettingsFromYAML("Resource Usage", moduleConfig, globalConfig) settings := resourceusage.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = resourceusage.NewWidget(app, settings) widget = resourceusage.NewWidget(app, settings)
case "rollbar": case "rollbar":
settings := rollbar.NewSettingsFromYAML("Rollbar", moduleConfig, globalConfig) settings := rollbar.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = rollbar.NewWidget(app, pages, settings) widget = rollbar.NewWidget(app, pages, settings)
case "security": case "security":
settings := security.NewSettingsFromYAML("Security", moduleConfig, globalConfig) settings := security.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = security.NewWidget(app, settings) widget = security.NewWidget(app, settings)
case "spotify": case "spotify":
settings := spotify.NewSettingsFromYAML("Spotify", moduleConfig, globalConfig) settings := spotify.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = spotify.NewWidget(app, pages, settings) widget = spotify.NewWidget(app, pages, settings)
case "spotifyweb": case "spotifyweb":
settings := spotifyweb.NewSettingsFromYAML("Spotify Web", moduleConfig, globalConfig) settings := spotifyweb.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = spotifyweb.NewWidget(app, pages, settings) widget = spotifyweb.NewWidget(app, pages, settings)
case "status": case "status":
settings := status.NewSettingsFromYAML("Status", moduleConfig, globalConfig) settings := status.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = status.NewWidget(app, settings) widget = status.NewWidget(app, settings)
// case "system": // case "system":
// settings := system.NewSettingsFromYAML("System", moduleConfig, globalConfig) // settings := system.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
// widget = system.NewWidget(app, date, version, settings) // widget = system.NewWidget(app, date, version, settings)
case "textfile": case "textfile":
settings := textfile.NewSettingsFromYAML("Textfile", moduleConfig, globalConfig) settings := textfile.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = textfile.NewWidget(app, pages, settings) widget = textfile.NewWidget(app, pages, settings)
case "todo": case "todo":
settings := todo.NewSettingsFromYAML("Todo", moduleConfig, globalConfig) settings := todo.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = todo.NewWidget(app, pages, settings) widget = todo.NewWidget(app, pages, settings)
case "todoist": case "todoist":
settings := todoist.NewSettingsFromYAML("Todoist", moduleConfig, globalConfig) settings := todoist.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = todoist.NewWidget(app, pages, settings) widget = todoist.NewWidget(app, pages, settings)
case "travisci": case "travisci":
settings := travisci.NewSettingsFromYAML("TravisCI", moduleConfig, globalConfig) settings := travisci.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = travisci.NewWidget(app, pages, settings) widget = travisci.NewWidget(app, pages, settings)
case "trello": case "trello":
settings := trello.NewSettingsFromYAML("Trello", moduleConfig, globalConfig) settings := trello.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = trello.NewWidget(app, settings) widget = trello.NewWidget(app, settings)
case "twitter": case "twitter":
settings := twitter.NewSettingsFromYAML("Twitter", moduleConfig, globalConfig) settings := twitter.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = twitter.NewWidget(app, pages, settings) widget = twitter.NewWidget(app, pages, settings)
case "victorops": case "victorops":
settings := victorops.NewSettingsFromYAML("VictorOps - OnCall", moduleConfig, globalConfig) settings := victorops.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = victorops.NewWidget(app, settings) widget = victorops.NewWidget(app, settings)
case "weather": case "weather":
settings := weather.NewSettingsFromYAML("Weather", moduleConfig, globalConfig) settings := weather.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = weather.NewWidget(app, pages, settings) widget = weather.NewWidget(app, pages, settings)
case "zendesk": case "zendesk":
settings := zendesk.NewSettingsFromYAML("Zendesk", moduleConfig, globalConfig) settings := zendesk.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig)
widget = zendesk.NewWidget(app, settings) widget = zendesk.NewWidget(app, settings)
default: default:
settings := unknown.NewSettingsFromYAML(widgetName, moduleConfig, globalConfig) 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 { for mod := range mods {
modConfig, _ := config.Get("wtf.mods." + mod) modConfig, _ := config.Get("wtf.mods." + mod)
widgetType := modConfig.UString("type", mod)
if enabled := modConfig.UBool("enabled", false); enabled { 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) widgets = append(widgets, widget)
} }
} }

8
modules/cmdrunner/settings.go
View File

@ -15,13 +15,13 @@ type Settings struct {
cmd string 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{ settings := Settings{
common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig), common: cfg.NewCommonSettingsFromModule(name, moduleConfig, globalConfig),
args: wtf.ToStrs(ymlConfig.UList("args")), args: wtf.ToStrs(moduleConfig.UList("args")),
cmd: ymlConfig.UString("cmd"), cmd: moduleConfig.UString("cmd"),
} }
return &settings return &settings