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

WTF-400 Move name and configKey values from widget to settings

Browse Source
This commit is contained in:
Chris Cummer
2019-04-17 17:16:26 -07:00
parent d174bd1497
commit b50c762dab
93 changed files with 351 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/weatherservices/prettyweather/settings.go
View File

@@ -5,6 +5,8 @@ import (
"github.com/wtfutil/wtf/cfg"
)
const configKey = "prettyweather"
type Settings struct {
common *cfg.Common
@@ -14,11 +16,11 @@ type Settings struct {
language string
}
func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
localConfig, _ := ymlConfig.Get("wtf.mods.prettyweather")
func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
settings := Settings{
common: cfg.NewCommonSettingsFromYAML(ymlConfig),
common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
city: localConfig.UString("city", "Barcelona"),
language: localConfig.UString("language", "en"),

2
modules/weatherservices/prettyweather/widget.go
View File

@@ -18,7 +18,7 @@ type Widget struct {
func NewWidget(app *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget(app, "Pretty Weather", "prettyweather", false),
TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
settings: settings,
}

8
modules/weatherservices/weather/settings.go
View File

@@ -7,6 +7,8 @@ import (
"github.com/wtfutil/wtf/cfg"
)
const configKey = "weather"
type colors struct {
current string
}
@@ -21,11 +23,11 @@ type Settings struct {
tempUnit string
}
func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
localConfig, _ := ymlConfig.Get("wtf.mods.weather")
func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
settings := Settings{
common: cfg.NewCommonSettingsFromYAML(ymlConfig),
common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
apiKey: localConfig.UString("apiKey", os.Getenv("WTF_OWM_API_KEY")),
cityIDs: localConfig.UList("cityids"),

2
modules/weatherservices/weather/widget.go
View File

@@ -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, "Weather", "weather", true),
TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
Idx: 0,
settings: settings,