mirror of
https://github.com/postmannen/ctrl.git
synced 2025-03-31 01:24:31 +00:00
added generation of info menu, and info page
This commit is contained in:
postmannen
parent
2be3a0be25
commit
01a077c3c4
3 changed files with 175 additions and 148 deletions
|
|
@ -1,11 +1,20 @@
|
|||
package stew
|
||||
|
||||
import "github.com/rivo/tview"
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/rivo/tview"
|
||||
)
|
||||
|
||||
func infoSlide(app *tview.Application) tview.Primitive {
|
||||
flex := tview.NewFlex()
|
||||
flex.SetTitle("info")
|
||||
flex.SetBorder(true)
|
||||
|
||||
textView := tview.NewTextView()
|
||||
flex.AddItem(textView, 0, 1, false)
|
||||
|
||||
fmt.Fprintf(textView, "Information page for Stew.\n")
|
||||
|
||||
return flex
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package stew
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
|
|
@ -453,3 +454,140 @@ func messageSlide(app *tview.Application) tview.Primitive {
|
|||
|
||||
return p.flex
|
||||
}
|
||||
|
||||
// Check and compare all the fields of the main message struct
|
||||
// used in Steward, and the message struct used in Stew that they are
|
||||
// equal.
|
||||
// If they are not equal an error will be returned to the user with
|
||||
// the name of the field that was missing in the Stew message struct.
|
||||
//
|
||||
// Some of the fields in the Steward Message struct are used by the
|
||||
// system for control, and not needed when creating an initial message
|
||||
// template, and we can add case statements for those fields below
|
||||
// that we do not wan't to check.
|
||||
func compareMsgAndMessage() error {
|
||||
stewardMessage := steward.Message{}
|
||||
stewMsg := msg{}
|
||||
|
||||
stewardRefVal := reflect.ValueOf(stewardMessage)
|
||||
stewRefVal := reflect.ValueOf(stewMsg)
|
||||
|
||||
// Loop trough all the fields of the Message struct.
|
||||
for i := 0; i < stewardRefVal.NumField(); i++ {
|
||||
found := false
|
||||
|
||||
for ii := 0; ii < stewRefVal.NumField(); ii++ {
|
||||
if stewardRefVal.Type().Field(i).Name == stewRefVal.Type().Field(ii).Name {
|
||||
found = true
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
// Case statements for the fields we don't care about for
|
||||
// the message template.
|
||||
if !found {
|
||||
switch stewardRefVal.Type().Field(i).Name {
|
||||
case "ID":
|
||||
// Not used in message template.
|
||||
case "FromNode":
|
||||
// Not used in message template.
|
||||
case "PreviousMessage":
|
||||
// Not used in message template.
|
||||
case "done":
|
||||
// Not used in message template.
|
||||
default:
|
||||
return fmt.Errorf("error: %v within the steward Message struct were not found in the stew msg struct", stewardRefVal.Type().Field(i).Name)
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// Will return the Label And the text Value of an input or dropdown form field.
|
||||
func getLabelAndValue(fi tview.FormItem) (string, string) {
|
||||
var label string
|
||||
var value string
|
||||
switch v := fi.(type) {
|
||||
case *tview.InputField:
|
||||
value = v.GetText()
|
||||
label = v.GetLabel()
|
||||
case *tview.DropDown:
|
||||
label = v.GetLabel()
|
||||
_, value = v.GetCurrentOption()
|
||||
}
|
||||
|
||||
return label, value
|
||||
}
|
||||
|
||||
// Check if number is int.
|
||||
func validateInteger(text string, ch rune) bool {
|
||||
if text == "-" {
|
||||
return true
|
||||
}
|
||||
_, err := strconv.Atoi(text)
|
||||
return err == nil
|
||||
}
|
||||
|
||||
// getNodes will load all the node names from a file, and return a slice of
|
||||
// string values, each representing a unique node.
|
||||
func getNodeNames(filePath string) ([]string, error) {
|
||||
|
||||
fh, err := os.Open(filePath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error: unable to open node file: %v", err)
|
||||
}
|
||||
defer fh.Close()
|
||||
|
||||
nodes := []string{}
|
||||
|
||||
scanner := bufio.NewScanner(fh)
|
||||
for scanner.Scan() {
|
||||
node := scanner.Text()
|
||||
nodes = append(nodes, node)
|
||||
}
|
||||
|
||||
return nodes, nil
|
||||
}
|
||||
|
||||
// -----------------------
|
||||
|
||||
// Creating a copy of the real Message struct here to use within the
|
||||
// field specification, but without the control kind of fields from
|
||||
// the original to avoid changing them to pointer values in the main
|
||||
// struct which would be needed when json marshaling to omit those
|
||||
// empty fields.
|
||||
type msg struct {
|
||||
// The node to send the message to
|
||||
ToNode steward.Node `json:"toNode" yaml:"toNode"`
|
||||
// The actual data in the message
|
||||
Data []string `json:"data" yaml:"data"`
|
||||
// Method, what is this message doing, etc. CLI, syslog, etc.
|
||||
Method steward.Method `json:"method" yaml:"method"`
|
||||
// ReplyMethod, is the method to use for the reply message.
|
||||
// By default the reply method will be set to log to file, but
|
||||
// you can override it setting your own here.
|
||||
ReplyMethod steward.Method `json:"replyMethod" yaml:"replyMethod"`
|
||||
// From what node the message originated
|
||||
ACKTimeout int `json:"ACKTimeout" yaml:"ACKTimeout"`
|
||||
// Resend retries
|
||||
Retries int `json:"retries" yaml:"retries"`
|
||||
// The ACK timeout of the new message created via a request event.
|
||||
ReplyACKTimeout int `json:"replyACKTimeout" yaml:"replyACKTimeout"`
|
||||
// The retries of the new message created via a request event.
|
||||
ReplyRetries int `json:"replyRetries" yaml:"replyRetries"`
|
||||
// Timeout for long a process should be allowed to operate
|
||||
MethodTimeout int `json:"methodTimeout" yaml:"methodTimeout"`
|
||||
// Directory is a string that can be used to create the
|
||||
//directory structure when saving the result of some method.
|
||||
// For example "syslog","metrics", or "metrics/mysensor"
|
||||
// The type is typically used in the handler of a method.
|
||||
Directory string `json:"directory" yaml:"directory"`
|
||||
// FileExtension is used to be able to set a wanted extension
|
||||
// on a file being saved as the result of data being handled
|
||||
// by a method handler.
|
||||
FileExtension string `json:"fileExtension" yaml:"fileExtension"`
|
||||
// operation are used to give an opCmd and opArg's.
|
||||
Operation interface{} `json:"operation,omitempty"`
|
||||
}
|
||||
|
|
|
|||
174
stew/stew.go
174
stew/stew.go
|
|
@ -1,17 +1,12 @@
|
|||
package stew
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"flag"
|
||||
"fmt"
|
||||
"os"
|
||||
"reflect"
|
||||
"strconv"
|
||||
|
||||
"github.com/gdamore/tcell/v2"
|
||||
"github.com/rivo/tview"
|
||||
|
||||
"github.com/RaaLabs/steward"
|
||||
)
|
||||
|
||||
type Stew struct {
|
||||
|
|
@ -33,6 +28,12 @@ func NewStew() (*Stew, error) {
|
|||
return &s, nil
|
||||
}
|
||||
|
||||
type slide struct {
|
||||
name string
|
||||
key tcell.Key
|
||||
primitive tview.Primitive
|
||||
}
|
||||
|
||||
func (s *Stew) Start() error {
|
||||
pages := tview.NewPages()
|
||||
|
||||
|
|
@ -53,15 +54,31 @@ func (s *Stew) Start() error {
|
|||
SetRegions(true).
|
||||
SetWrap(false)
|
||||
|
||||
fmt.Fprintf(info, " F1 info ")
|
||||
fmt.Fprintf(info, " F2 message ")
|
||||
// The slides to draw, and their name.
|
||||
// NB: This slice is being looped over further below, to create the menu
|
||||
// elements. If adding a new slide, make sure that slides are ordererin
|
||||
// chronological order, so we can auto generate the info menu with it's
|
||||
// corresponding F key based on the slice index+1.
|
||||
slides := []slide{
|
||||
{name: "info", key: tcell.KeyF1, primitive: infoSlide(app)},
|
||||
{name: "message", key: tcell.KeyF2, primitive: messageSlide(app)},
|
||||
}
|
||||
|
||||
pages.AddPage("info", infoSlide(app), true, true)
|
||||
pages.AddPage("message", messageSlide(app), true, false)
|
||||
// Add on page for each slide.
|
||||
for i, v := range slides {
|
||||
if i == 0 {
|
||||
pages.AddPage(v.name, v.primitive, true, true)
|
||||
fmt.Fprintf(info, " F%v:%v ", i+1, v.name)
|
||||
continue
|
||||
}
|
||||
|
||||
pages.AddPage(v.name, v.primitive, true, false)
|
||||
fmt.Fprintf(info, " F%v:%v ", i+1, v.name)
|
||||
}
|
||||
|
||||
// Create the main layout.
|
||||
layout := tview.NewFlex()
|
||||
layout.SetBorder(true)
|
||||
//layout.SetBorder(true)
|
||||
layout.SetDirection(tview.FlexRow).
|
||||
AddItem(pages, 0, 10, true).
|
||||
AddItem(info, 1, 1, false)
|
||||
|
|
@ -72,140 +89,3 @@ func (s *Stew) Start() error {
|
|||
|
||||
return nil
|
||||
}
|
||||
|
||||
// Check and compare all the fields of the main message struct
|
||||
// used in Steward, and the message struct used in Stew that they are
|
||||
// equal.
|
||||
// If they are not equal an error will be returned to the user with
|
||||
// the name of the field that was missing in the Stew message struct.
|
||||
//
|
||||
// Some of the fields in the Steward Message struct are used by the
|
||||
// system for control, and not needed when creating an initial message
|
||||
// template, and we can add case statements for those fields below
|
||||
// that we do not wan't to check.
|
||||
func compareMsgAndMessage() error {
|
||||
stewardMessage := steward.Message{}
|
||||
stewMsg := msg{}
|
||||
|
||||
stewardRefVal := reflect.ValueOf(stewardMessage)
|
||||
stewRefVal := reflect.ValueOf(stewMsg)
|
||||
|
||||
// Loop trough all the fields of the Message struct.
|
||||
for i := 0; i < stewardRefVal.NumField(); i++ {
|
||||
found := false
|
||||
|
||||
for ii := 0; ii < stewRefVal.NumField(); ii++ {
|
||||
if stewardRefVal.Type().Field(i).Name == stewRefVal.Type().Field(ii).Name {
|
||||
found = true
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
// Case statements for the fields we don't care about for
|
||||
// the message template.
|
||||
if !found {
|
||||
switch stewardRefVal.Type().Field(i).Name {
|
||||
case "ID":
|
||||
// Not used in message template.
|
||||
case "FromNode":
|
||||
// Not used in message template.
|
||||
case "PreviousMessage":
|
||||
// Not used in message template.
|
||||
case "done":
|
||||
// Not used in message template.
|
||||
default:
|
||||
return fmt.Errorf("error: %v within the steward Message struct were not found in the stew msg struct", stewardRefVal.Type().Field(i).Name)
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// Will return the Label And the text Value of an input or dropdown form field.
|
||||
func getLabelAndValue(fi tview.FormItem) (string, string) {
|
||||
var label string
|
||||
var value string
|
||||
switch v := fi.(type) {
|
||||
case *tview.InputField:
|
||||
value = v.GetText()
|
||||
label = v.GetLabel()
|
||||
case *tview.DropDown:
|
||||
label = v.GetLabel()
|
||||
_, value = v.GetCurrentOption()
|
||||
}
|
||||
|
||||
return label, value
|
||||
}
|
||||
|
||||
// Check if number is int.
|
||||
func validateInteger(text string, ch rune) bool {
|
||||
if text == "-" {
|
||||
return true
|
||||
}
|
||||
_, err := strconv.Atoi(text)
|
||||
return err == nil
|
||||
}
|
||||
|
||||
// getNodes will load all the node names from a file, and return a slice of
|
||||
// string values, each representing a unique node.
|
||||
func getNodeNames(filePath string) ([]string, error) {
|
||||
|
||||
fh, err := os.Open(filePath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error: unable to open node file: %v", err)
|
||||
}
|
||||
defer fh.Close()
|
||||
|
||||
nodes := []string{}
|
||||
|
||||
scanner := bufio.NewScanner(fh)
|
||||
for scanner.Scan() {
|
||||
node := scanner.Text()
|
||||
nodes = append(nodes, node)
|
||||
}
|
||||
|
||||
return nodes, nil
|
||||
}
|
||||
|
||||
// -----------------------
|
||||
|
||||
// Creating a copy of the real Message struct here to use within the
|
||||
// field specification, but without the control kind of fields from
|
||||
// the original to avoid changing them to pointer values in the main
|
||||
// struct which would be needed when json marshaling to omit those
|
||||
// empty fields.
|
||||
type msg struct {
|
||||
// The node to send the message to
|
||||
ToNode steward.Node `json:"toNode" yaml:"toNode"`
|
||||
// The actual data in the message
|
||||
Data []string `json:"data" yaml:"data"`
|
||||
// Method, what is this message doing, etc. CLI, syslog, etc.
|
||||
Method steward.Method `json:"method" yaml:"method"`
|
||||
// ReplyMethod, is the method to use for the reply message.
|
||||
// By default the reply method will be set to log to file, but
|
||||
// you can override it setting your own here.
|
||||
ReplyMethod steward.Method `json:"replyMethod" yaml:"replyMethod"`
|
||||
// From what node the message originated
|
||||
ACKTimeout int `json:"ACKTimeout" yaml:"ACKTimeout"`
|
||||
// Resend retries
|
||||
Retries int `json:"retries" yaml:"retries"`
|
||||
// The ACK timeout of the new message created via a request event.
|
||||
ReplyACKTimeout int `json:"replyACKTimeout" yaml:"replyACKTimeout"`
|
||||
// The retries of the new message created via a request event.
|
||||
ReplyRetries int `json:"replyRetries" yaml:"replyRetries"`
|
||||
// Timeout for long a process should be allowed to operate
|
||||
MethodTimeout int `json:"methodTimeout" yaml:"methodTimeout"`
|
||||
// Directory is a string that can be used to create the
|
||||
//directory structure when saving the result of some method.
|
||||
// For example "syslog","metrics", or "metrics/mysensor"
|
||||
// The type is typically used in the handler of a method.
|
||||
Directory string `json:"directory" yaml:"directory"`
|
||||
// FileExtension is used to be able to set a wanted extension
|
||||
// on a file being saved as the result of data being handled
|
||||
// by a method handler.
|
||||
FileExtension string `json:"fileExtension" yaml:"fileExtension"`
|
||||
// operation are used to give an opCmd and opArg's.
|
||||
Operation interface{} `json:"operation,omitempty"`
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue