From 27696b976485f989d664f330e9c328de93e8e672 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sat, 16 Dec 2023 09:02:59 -0600 Subject: gocui mode works again Signed-off-by: Jeff Carr --- main.go | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index d283329..620b4a6 100644 --- a/main.go +++ b/main.go @@ -5,19 +5,21 @@ package main import ( + "log" "strconv" "runtime" "time" - arg "github.com/alexflint/go-arg" + "embed" "git.wit.org/wit/gui" ) -var p *arg.Parser var myGui *gui.Node +//go:embed plugins/*.so +var resToolkit embed.FS + func main() { - p = arg.MustParse(&args) - parsedown() + // parsedown() // initialize the maps to track IP addresses and network interfaces me.ipmap = make(map[string]*IPtype) @@ -25,16 +27,11 @@ func main() { me.ifmap = make(map[int]*IFtype) me.dnsTTL = 5 // recheck DNS is working every 2 minutes // TODO: watch rx packets? - log("Toolkit = ", args.GuiToolkit) - for i, t := range args.GuiToolkit { - log("trying to load plugin", i, t) - myGui.LoadToolkit(t) - } - // will set all debugging flags // gui.SetDebug(true) - myGui = gui.New().LoadToolkit("gocui") + // myGui = gui.New().InitEmbed(resToolkit).LoadToolkit("gocui") + myGui = gui.New().Default() sleep(1) setupControlPanelWindow() sleep(1) @@ -60,7 +57,7 @@ func checkNetworkChanges() { if (runtime.GOOS == "linux") { dnsTTL() } else { - log("Windows and MacOS don't work yet") + log.Println("Windows and MacOS don't work yet") } ttl = me.dnsTTL } @@ -71,25 +68,25 @@ func checkNetworkChanges() { // and verifies that DNS is working or not working func dnsTTL() { me.changed = false - log("FQDN =", me.fqdn.GetText()) + log.Println("FQDN =", me.fqdn.GetText()) getHostname() scanInterfaces() for i, t := range me.ifmap { - log(strconv.Itoa(i) + " iface = " + t.iface.Name) + log.Println(strconv.Itoa(i) + " iface = " + t.iface.Name) } var aaaa []string aaaa = realAAAA() var all string for _, s := range aaaa { - log("my actual AAAA = ",s) + log.Println("my actual AAAA = ",s) all += s + "\n" } // me.IPv6.SetText(all) if (me.changed) { stamp := time.Now().Format("2006/01/02 15:04:05") - log(logError, "Network things changed on", stamp) + log.Println(logError, "Network things changed on", stamp) updateDNS() } } -- cgit v1.2.3