From ea88f5eece71582b8cc59398f860feaa68abc818 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Tue, 16 Apr 2019 09:09:42 -0700 Subject: [PATCH] WTF-400 System extracted to new config format --- main.go | 3 ++- modules/system/settings.go | 18 ++++++++++++++++++ modules/system/widget.go | 10 ++++++---- 3 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 modules/system/settings.go diff --git a/main.go b/main.go index 8d5c39dd..69e17ea9 100644 --- a/main.go +++ b/main.go @@ -286,7 +286,8 @@ func makeWidget(app *tview.Application, pages *tview.Pages, widgetName string) w settings := status.NewSettingsFromYAML(wtf.Config) widget = status.NewWidget(app, settings) case "system": - widget = system.NewWidget(app, date, version) + settings := system.NewSettingsFromYAML(wtf.Config) + widget = system.NewWidget(app, date, version, settings) case "textfile": widget = textfile.NewWidget(app, pages) case "todo": diff --git a/modules/system/settings.go b/modules/system/settings.go new file mode 100644 index 00000000..67662fea --- /dev/null +++ b/modules/system/settings.go @@ -0,0 +1,18 @@ +package system + +import ( + "github.com/olebedev/config" + "github.com/wtfutil/wtf/cfg" +) + +type Settings struct { + common *cfg.Common +} + +func NewSettingsFromYAML(ymlConfig *config.Config) *Settings { + settings := Settings{ + common: cfg.NewCommonSettingsFromYAML(ymlConfig), + } + + return &settings +} diff --git a/modules/system/widget.go b/modules/system/widget.go index 063930f7..e5bb08a4 100644 --- a/modules/system/widget.go +++ b/modules/system/widget.go @@ -11,17 +11,19 @@ import ( type Widget struct { wtf.TextWidget - systemInfo *SystemInfo Date string Version string + settings *Settings + systemInfo *SystemInfo } -func NewWidget(app *tview.Application, date, version string) *Widget { +func NewWidget(app *tview.Application, date, version string, settings *Settings) *Widget { widget := Widget{ TextWidget: wtf.NewTextWidget(app, "System", "system", false), - Date: date, - Version: version, + Date: date, + settings: settings, + Version: version, } widget.systemInfo = NewSystemInfo()