mirror of
https://github.com/taigrr/wtf
synced 2025-01-18 04:03:14 -08:00
Simplify the inclusion of the Common config settings into each module
Signed-off-by: Chris Cummer <chriscummer@me.com>
This commit is contained in:
@@ -11,12 +11,12 @@ const (
|
||||
)
|
||||
|
||||
type Settings struct {
|
||||
common *cfg.Common
|
||||
*cfg.Common
|
||||
}
|
||||
|
||||
func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
|
||||
settings := Settings{
|
||||
common: cfg.NewCommonSettingsFromModule(name, defaultTitle, defaultFocusable, ymlConfig, globalConfig),
|
||||
Common: cfg.NewCommonSettingsFromModule(name, defaultTitle, defaultFocusable, ymlConfig, globalConfig),
|
||||
}
|
||||
|
||||
return &settings
|
||||
|
||||
@@ -16,7 +16,7 @@ type Widget struct {
|
||||
|
||||
func NewWidget(app *tview.Application, settings *Settings) *Widget {
|
||||
widget := Widget{
|
||||
TextWidget: view.NewTextWidget(app, nil, settings.common),
|
||||
TextWidget: view.NewTextWidget(app, nil, settings.Common),
|
||||
|
||||
settings: settings,
|
||||
}
|
||||
@@ -40,21 +40,21 @@ func (widget *Widget) Refresh() {
|
||||
func (widget *Widget) content() (string, string, bool) {
|
||||
data := NewSecurityData()
|
||||
data.Fetch()
|
||||
str := fmt.Sprintf(" [%s]WiFi[white]\n", widget.settings.common.Colors.Subheading)
|
||||
str := fmt.Sprintf(" [%s]WiFi[white]\n", widget.settings.Colors.Subheading)
|
||||
str += fmt.Sprintf(" %8s: %s\n", "Network", data.WifiName)
|
||||
str += fmt.Sprintf(" %8s: %s\n", "Crypto", data.WifiEncryption)
|
||||
str += "\n"
|
||||
|
||||
str += fmt.Sprintf(" [%s]Firewall[white]\n", widget.settings.common.Colors.Subheading)
|
||||
str += fmt.Sprintf(" [%s]Firewall[white]\n", widget.settings.Colors.Subheading)
|
||||
str += fmt.Sprintf(" %8s: %4s\n", "Status", data.FirewallEnabled)
|
||||
str += fmt.Sprintf(" %8s: %4s\n", "Stealth", data.FirewallStealth)
|
||||
str += "\n"
|
||||
|
||||
str += fmt.Sprintf(" [%s]Users[white]\n", widget.settings.common.Colors.Subheading)
|
||||
str += fmt.Sprintf(" [%s]Users[white]\n", widget.settings.Colors.Subheading)
|
||||
str += fmt.Sprintf(" %s", strings.Join(data.LoggedInUsers, "\n "))
|
||||
str += "\n\n"
|
||||
|
||||
str += fmt.Sprintf(" [%s]DNS[white]\n", widget.settings.common.Colors.Subheading)
|
||||
str += fmt.Sprintf(" [%s]DNS[white]\n", widget.settings.Colors.Subheading)
|
||||
str += fmt.Sprintf(" %12s\n", data.DnsAt(0))
|
||||
str += fmt.Sprintf(" %12s\n", data.DnsAt(1))
|
||||
str += "\n"
|
||||
|
||||
Reference in New Issue
Block a user