From 8df624f2c0884725f97bbc6f271a00f19a385f14 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Tue, 16 Apr 2019 01:54:39 -0700 Subject: [PATCH] WTF-400 ResourceUsage extracted to new config format --- main.go | 3 ++- modules/resourceusage/settings.go | 18 ++++++++++++++++++ modules/resourceusage/widget.go | 6 +++++- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 modules/resourceusage/settings.go diff --git a/main.go b/main.go index 621e302e..343b388d 100644 --- a/main.go +++ b/main.go @@ -268,7 +268,8 @@ func makeWidget(app *tview.Application, pages *tview.Pages, widgetName string) w settings := prettyweather.NewSettingsFromYAML(wtf.Config) widget = prettyweather.NewWidget(app, settings) case "resourceusage": - widget = resourceusage.NewWidget(app) + settings := resourceusage.NewSettingsFromYAML(wtf.Config) + widget = resourceusage.NewWidget(app, settings) case "security": widget = security.NewWidget(app) case "status": diff --git a/modules/resourceusage/settings.go b/modules/resourceusage/settings.go new file mode 100644 index 00000000..1910666d --- /dev/null +++ b/modules/resourceusage/settings.go @@ -0,0 +1,18 @@ +package resourceusage + +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/resourceusage/widget.go b/modules/resourceusage/widget.go index f4991c35..d1218f41 100644 --- a/modules/resourceusage/widget.go +++ b/modules/resourceusage/widget.go @@ -17,12 +17,16 @@ var ok = true // Widget define wtf widget to register widget later type Widget struct { wtf.BarGraph + + settings *Settings } // NewWidget Make new instance of widget -func NewWidget(app *tview.Application) *Widget { +func NewWidget(app *tview.Application, settings *Settings) *Widget { widget := Widget{ BarGraph: wtf.NewBarGraph(app, "Resource Usage", "resourceusage", false), + + settings: settings, } widget.View.SetWrap(false)