new argvv0.1.59

6 files changed, 104 insertions, 34 deletions

diff --git a/Makefile b/Makefile
index 56d2f26..7fc912c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 .PHONY: build
 
 VERSION = $(shell git describe --tags)
-BUILDTIME = $(shell date +%Y.%m.%d)
+BUILDTIME = $(shell date +%s)
 
-all: build
+all: goimports build
 	./virtigod --version
 
 build:
diff --git a/argv.go b/argv.custom.go
index 525f68e..04835d7 100644
--- a/argv.go
+++ b/argv.custom.go
@@ -1,27 +1,9 @@
 package main
 
-/*
-	this parses the command line arguements
-	this enables command line options from other packages like 'gui' and 'log'
-*/
+var VERSION string
+var BUILDTIME string
 
-import (
-	"go.wit.com/dev/alexflint/arg"
-)
-
-var argv args
-
-type args struct {
-	Port int `arg:"--port"            default:"2520"  help:"port to run on"`
-}
-
-func (args) Version() string {
-	return "virtigod " + Version
-}
-
-func init() {
-	arg.MustParse(&argv)
-}
+var APPNAME string = "virtigod"
 
 func (a args) Description() string {
 	return `
diff --git a/argv.struct.go b/argv.struct.go
new file mode 100644
index 0000000..ecaae3d
--- /dev/null
+++ b/argv.struct.go
@@ -0,0 +1,7 @@
+package main
+
+var argv args
+
+type args struct {
+	Port int `arg:"--port"            default:"2520"  help:"port to run on"`
+}
diff --git a/argv.template.go b/argv.template.go
new file mode 100644
index 0000000..e7a9948
--- /dev/null
+++ b/argv.template.go
@@ -0,0 +1,80 @@
+package main
+
+// these are stubbed in functions needed
+// just copy this file from another working app for now
+// you shouldn't need to change anything here
+// TODO: clean this up in argv
+
+import (
+	"os"
+
+	"go.wit.com/dev/alexflint/arg"
+	"go.wit.com/gui"
+	"go.wit.com/lib/fhelp"
+	"go.wit.com/log"
+)
+
+func (args) InitArgv() (string, string, string) {
+	return APPNAME, BUILDTIME, VERSION
+}
+
+// this function will send the current argv PB to go-args for parsing
+func (args) ParseFlags(flags []string) error {
+	var err error
+	if me.pp == nil {
+		// log.Info("Parse Flags GOT flags:", flags)
+		me.pp, err = arg.ParseFlags(flags, &argv)
+		// panic("got to the app's ParseFlags()")
+	} else {
+		panic("me.pp was not nil")
+	}
+	return err
+}
+
+// add this funcgion: this will print the help
+func (args) WriteHelpForSubcommand(cmd string) error {
+	me.pp.WriteHelpForSubcommand(os.Stderr, cmd)
+	return nil
+}
+
+// this will print the help for the subcmd
+func (args) WriteHelpForAutocomplete(part string, subcmd ...string) error {
+	return me.pp.WriteHelpForAutocomplete(os.Stderr, os.Stdout, part, subcmd...)
+}
+
+func (args) WriteHelpForAutocompleteDebug(part string, subcmd ...string) error {
+	f, _ := os.OpenFile("/tmp/argv.junk", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	return me.pp.WriteHelpForAutocomplete(f, os.Stdout, part, subcmd...)
+}
+
+// add this funcgion: this will print the help
+func (args) WriteHelp() error {
+	me.pp.WriteHelp(os.Stderr)
+	return nil
+}
+
+func (args) InitGui() error {
+	// panic("got here")
+	arg.Register(&gui.ArgvGui)
+	// me.gui = gui.PreInit()
+	me.myGui = fhelp.Gui()
+	return nil
+}
+
+func (args) Exit() {
+	gui.UnloadToolkits()
+	if me.argv.Verbose() {
+		log.Info("argv.Exit() called", APPNAME+".Exit()")
+	}
+	// remove this from the template for your app (or make one for youself if you need it)
+	// forgeExit() // custom forge shutdown function
+}
+
+func (args) Help() string {
+	return "got app help"
+}
+
+func (args) MustParse() error {
+	me.pp = arg.MustParse(&argv)
+	return nil
+}
diff --git a/main.go b/main.go
index 3ef9aab..1bc1740 100644
--- a/main.go
+++ b/main.go
@@ -21,24 +21,17 @@ import (
 	"time"
 
 	"github.com/digitalocean/go-qemu/hypervisor"
-	"go.wit.com/dev/alexflint/arg"
+	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/log"
 )
 
-var Version string
-
 //go:embed resources/*
 var resources embed.FS
 
 func main() {
-	var pp *arg.Parser
-	pp = arg.MustParse(&argv)
-
-	if pp == nil {
-		pp.WriteHelp(os.Stdout)
-		os.Exit(0)
-	}
 	me = new(Virtigod)
+	me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args
+
 	me.Hostname, _ = os.Hostname()
 
 	log.DaemonMode(true)
diff --git a/structs.go b/structs.go
index 8c8caed..e652eed 100644
--- a/structs.go
+++ b/structs.go
@@ -1,11 +1,19 @@
 package main
 
-import "github.com/digitalocean/go-qemu/hypervisor"
+import (
+	"github.com/digitalocean/go-qemu/hypervisor"
+	"go.wit.com/dev/alexflint/arg"
+	"go.wit.com/lib/fhelp"
+	"go.wit.com/lib/protobuf/argvpb"
+)
 
 var me *Virtigod
 
 // this app's variables
 type Virtigod struct {
+	argv     *argvpb.Argv   // more experiments for bash handling
+	pp       *arg.Parser    // for parsing the command line args.  Yay to alexf lint!
+	myGui    *fhelp.GuiPrep // for initializing the GUI toolkits
 	Hostname string
 	dirs     []string
 	hv       *hypervisor.Hypervisor