From 265149ca1152a90ad4d73754d073536ff61d61d8 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Mon, 15 Apr 2019 21:38:10 -0700 Subject: [PATCH] WTF-400 Power extracted to new config format --- main.go | 3 ++- modules/power/settings.go | 20 ++++++++++++++++++++ modules/power/widget.go | 9 ++++++--- 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 modules/power/settings.go diff --git a/main.go b/main.go index 93fb1510..67e60119 100644 --- a/main.go +++ b/main.go @@ -261,7 +261,8 @@ func makeWidget(app *tview.Application, pages *tview.Pages, widgetName string) w case "pagerduty": widget = pagerduty.NewWidget(app) case "power": - widget = power.NewWidget(app) + settings := power.NewSettingsFromYAML(wtf.Config) + widget = power.NewWidget(app, settings) case "prettyweather": widget = prettyweather.NewWidget(app) case "resourceusage": diff --git a/modules/power/settings.go b/modules/power/settings.go new file mode 100644 index 00000000..8d03c2bf --- /dev/null +++ b/modules/power/settings.go @@ -0,0 +1,20 @@ +package power + +import ( + "github.com/olebedev/config" + "github.com/wtfutil/wtf/cfg" +) + +type Settings struct { + common *cfg.Common + + filePath string +} + +func NewSettingsFromYAML(ymlConfig *config.Config) *Settings { + settings := Settings{ + common: cfg.NewCommonSettingsFromYAML(ymlConfig), + } + + return &settings +} diff --git a/modules/power/widget.go b/modules/power/widget.go index ee091df3..97891b1d 100644 --- a/modules/power/widget.go +++ b/modules/power/widget.go @@ -10,13 +10,16 @@ import ( type Widget struct { wtf.TextWidget - Battery *Battery + Battery *Battery + settings *Settings } -func NewWidget(app *tview.Application) *Widget { +func NewWidget(app *tview.Application, settings *Settings) *Widget { widget := Widget{ TextWidget: wtf.NewTextWidget(app, "Power", "power", false), - Battery: NewBattery(), + + Battery: NewBattery(), + settings: settings, } widget.View.SetWrap(true)