feat: add toolbar and support on-click item refresh

Author: stuchl4n3k

README.md

@@ -24,7 +24,7 @@ _**DISCLAIMER:** This tool is still under wild development!_
 ```bash
 usage: s3mon [-h|--help] [-v|--version] [-V|--verbose] [-c|--config "<value>"]
 
-             s3mon - simple service status monitor v1.0 by stuchl4n3k
+             s3mon - simple service status monitor v1.1 by stuchl4n3k
 
 Arguments:
 

main.go

@@ -11,7 +11,7 @@ import (
 
 const (
 	prog        = "s3mon"
-	version     = "1.0"
+	version     = "1.1"
 	author      = "stuchl4n3k"
 	description = "s3mon - simple service status monitor v" + version + " by " + author
 )
@@ -54,25 +54,27 @@ func main() {
 	// GUI:
 	gui := initGui(config)
 	defer closeGui(gui)
-	go monitorItems(config.Items, gui)
+	go updateItems(config.Items, gui)
 	runMainLoop(gui)
 }
 
-func monitorItems(items []*Item, gui *gocui.Gui) {
+func updateItems(items []*Item, gui *gocui.Gui) {
 	for {
 		for _, item := range items {
-			result := monitorItem(item)
-			updateItemView(item, result, gui)
-
+			updateItem(item, gui)
 			time.Sleep(1 * time.Second)
 		}
 	}
 }
 
+func updateItem(item *Item, gui *gocui.Gui) {
+	result := monitorItem(item)
+	updateItemView(item, result, gui)
+}
+
 func monitorItem(item *Item) string {
 	output, err := runScript(item.Script, item.Label)
 	if err != nil {
-		// LogErr(err.Error())
 		return ResultErr
 	}
 

ui.go

@@ -3,14 +3,20 @@ package main
 import (
 	"fmt"
 	"github.com/jroimartin/gocui"
+	"net"
 	"strconv"
 	"strings"
 )
 
 var (
-	itemWidth   = 10
-	itemHeight  = 4
-	itemPadding = 1
+	toolBarHeight = 2
+	itemWidth     = 10
+	itemHeight    = 4
+	itemPadding   = 1
+	maxX          = 0
+	maxY          = 0
+	plotterX      = 0
+	plotterY      = 0
 )
 
 func initGui(config *Config) *gocui.Gui {
@@ -19,12 +25,11 @@ func initGui(config *Config) *gocui.Gui {
 		LogPanic(err.Error())
 	}
 
-	maxX, maxY := gui.Size()
-	for i, item := range config.Items {
-		if err := createItemView(item, i, maxX, maxY, gui); err != nil {
-			LogPanic(err.Error())
-		}
-	}
+	maxX, maxY = gui.Size()
+	gui.Mouse = true
+
+	createToolBarView(gui)
+	createMonitoringView(config.Items, gui)
 
 	if err := gui.SetKeybinding("", 'q', gocui.ModNone, quit); err != nil {
 		LogPanic(err.Error())
@@ -36,7 +41,28 @@ func initGui(config *Config) *gocui.Gui {
 	return gui
 }
 
-func createItemView(item *Item, col int, maxX int, maxY int, gui *gocui.Gui) error {
+func createToolBarView(gui *gocui.Gui) {
+	view, err := gui.SetView("toolbar", plotterX, plotterY, maxX-1, plotterY+toolBarHeight)
+	if err != nil && err != gocui.ErrUnknownView {
+		LogPanic(err.Error())
+	}
+
+	fmt.Fprintf(view, "%s v%s | IP: %s", prog, version, getOutboundIP())
+
+	plotterY += toolBarHeight + itemPadding
+}
+
+func createMonitoringView(items []*Item, gui *gocui.Gui) {
+	for i, item := range items {
+		if err := createMonitoringItemView(item, i, maxX, maxY, gui); err != nil {
+			LogPanic(err.Error())
+		}
+	}
+
+	plotterY += itemHeight + itemPadding
+}
+
+func createMonitoringItemView(item *Item, col int, maxX int, maxY int, gui *gocui.Gui) error {
 	itemsPerLine := maxX / (itemWidth + itemPadding)
 	row := 0
 
@@ -45,8 +71,8 @@ func createItemView(item *Item, col int, maxX int, maxY int, gui *gocui.Gui) err
 		col %= itemsPerLine
 	}
 
-	x := col * (itemWidth + itemPadding)
-	y := row * (itemHeight + itemPadding)
+	x := plotterX + col*(itemWidth+itemPadding)
+	y := plotterY + row*(itemHeight+itemPadding)
 
 	view, err := gui.SetView(item.Label, x, y, x+itemWidth, y+itemHeight)
 	if err != nil && err != gocui.ErrUnknownView {
@@ -59,6 +85,13 @@ func createItemView(item *Item, col int, maxX int, maxY int, gui *gocui.Gui) err
 	view.Overwrite = true
 
 	fmt.Fprint(view, "\n\n loading")
+
+	// Bind mouse-click to item refresh.
+	gui.SetKeybinding(item.Label, gocui.MouseLeft, gocui.ModNone, func(gui *gocui.Gui, view *gocui.View) error {
+		updateItem(item, gui)
+		return nil
+	})
+
 	return nil
 }
 
@@ -118,3 +151,15 @@ func runMainLoop(gui *gocui.Gui) {
 func quit(gui *gocui.Gui, v *gocui.View) error {
 	return gocui.ErrQuit
 }
+
+func getOutboundIP() string {
+	conn, err := net.Dial("udp", "1.1.1.1:80")
+	if err != nil {
+		return "?"
+	}
+	defer conn.Close()
+
+	localAddr := conn.LocalAddr().(*net.UDPAddr)
+
+	return localAddr.IP.String()
+}