From 892659ba7f596fa4a37870bd329c38e7f7566bec Mon Sep 17 00:00:00 2001 From: evilsocket Date: Sat, 13 Jan 2018 14:00:57 +0100 Subject: [PATCH] fix: better 'active' menu --- session/module_param.go | 5 +++++ session/session_core_handlers.go | 12 +++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/session/module_param.go b/session/module_param.go index 58adb0af..ea9cb12d 100644 --- a/session/module_param.go +++ b/session/module_param.go @@ -104,6 +104,11 @@ func (p ModuleParam) Get(s *Session) (error, interface{}) { } +func (p ModuleParam) Dump(padding int) string { + return fmt.Sprintf(" "+core.YELLOW+"%"+strconv.Itoa(padding)+"s"+core.RESET+ + " : %s\n", p.Name, p.Value) +} + func (p ModuleParam) Help(padding int) string { return fmt.Sprintf(" "+core.YELLOW+"%"+strconv.Itoa(padding)+"s"+core.RESET+ " : "+ diff --git a/session/session_core_handlers.go b/session/session_core_handlers.go index 806ac52e..5479e181 100644 --- a/session/session_core_handlers.go +++ b/session/session_core_handlers.go @@ -74,15 +74,17 @@ func (s *Session) activeHandler(args []string, sess *Session) error { if m.Running() == false { continue } - fmt.Printf("[%s] %s (%s)\n", core.Green("active"), m.Name(), core.Dim(m.Description())) + + fmt.Printf("%s (%s)\n", core.Bold(m.Name()), core.Dim(m.Description())) params := m.Parameters() if len(params) > 0 { - for _, p := range params { - _, p.Value = s.Env.Get(p.Name) - fmt.Printf(" %s: '%s'\n", p.Name, core.Yellow(p.Value)) - } fmt.Println() + for _, p := range params { + fmt.Printf(p.Dump(s.HelpPadding)) + } } + + fmt.Println() } return nil