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

Simplify the inclusion of the Common config settings into each module

Browse Source 
Signed-off-by: Chris Cummer <chriscummer@me.com>
This commit is contained in:
Chris Cummer
2020-11-26 19:53:21 -08:00
parent f9a06540f1
commit d6a0797bf2
161 changed files with 378 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/twitch/settings.go
View File

@@ -13,7 +13,7 @@ const (
)
type Settings struct {
common *cfg.Common
*cfg.Common
numberOfResults int `help:"Number of results to show. Default is 10." optional:"true"`
clientId string `help:"Client Id (default is env var TWITCH_CLIENT_ID)"`
@@ -33,7 +33,8 @@ func defaultLanguage() []interface{} {
func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
twitch := ymlConfig.UString("twitch")
settings := Settings{
common: cfg.NewCommonSettingsFromModule(name, twitch, defaultFocusable, ymlConfig, globalConfig),
Common: cfg.NewCommonSettingsFromModule(name, twitch, defaultFocusable, ymlConfig, globalConfig),
numberOfResults: ymlConfig.UInt("numberOfResults", 10),
clientId: ymlConfig.UString("clientId", os.Getenv("TWITCH_CLIENT_ID")),
languages: utils.ToStrs(ymlConfig.UList("languages", defaultLanguage())),

2
modules/twitch/widget.go
View File

@@ -29,7 +29,7 @@ type Stream struct {
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := &Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
settings: settings,
twitch: NewClient(settings.clientId),
}