new argvv0.0.108

5 files changed, 101 insertions, 39 deletions

diff --git a/argv.go b/argv.custom.go
index 328da54..fbbdc67 100644
--- a/argv.go
+++ b/argv.custom.go
@@ -3,11 +3,6 @@
 
 package main
 
-/*
-	this parses the command line arguements
-	this enables command line options from other packages like 'gui' and 'log'
-*/
-
 import (
 	"os"
 
@@ -15,18 +10,12 @@ import (
 	"go.wit.com/log"
 )
 
-var argv args
+// sent via -ldflags
+var VERSION string
+var BUILDTIME string
 
-type args struct {
-	Status *EmptyCmd `arg:"subcommand:status"                    help:"should display something"`
-	Test   *EmptyCmd `arg:"subcommand:test"                      help:"test stuff"`
-	Daemon bool      `arg:"--daemon"           default:"false"  help:"run in daemon mode"`
-	Port   int       `arg:"--port"             default:"2521"   help:"port to run on"`
-	URL    string    `arg:"--url"                               help:"url to use"`
-}
-
-type EmptyCmd struct {
-}
+// used for shell auto completion
+var APPNAME string = "zood"
 
 func (a args) Description() string {
 	return `
@@ -49,18 +38,6 @@ func init() {
 	WARN = log.NewFlag("WARN", true, full, short, "bad things")
 }
 
-func (args) Version() string {
-	return argvpb.StandardVersion(ARGNAME, VERSION, BUILDTIME)
-}
-
-func (args) Buildtime() (string, string) {
-	return BUILDTIME, VERSION
-}
-
-func (args) Appname() string {
-	return ARGNAME
-}
-
 // sends the strings to bash or zsh that will be your options
 func (a args) SendCompletionStrings(pb *argvpb.Argv) {
 	if pb.Cmd == "" {
diff --git a/argv.struct.go b/argv.struct.go
new file mode 100644
index 0000000..7088811
--- /dev/null
+++ b/argv.struct.go
@@ -0,0 +1,17 @@
+// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
+// Use of this source code is governed by the GPL 3.0
+
+package main
+
+var argv args
+
+type args struct {
+	Status *EmptyCmd `arg:"subcommand:status"                    help:"should display something"`
+	Test   *EmptyCmd `arg:"subcommand:test"                      help:"test stuff"`
+	Daemon bool      `arg:"--daemon"           default:"false"  help:"run in daemon mode"`
+	Port   int       `arg:"--port"             default:"2521"   help:"port to run on"`
+	URL    string    `arg:"--url"                               help:"url to use"`
+}
+
+type EmptyCmd struct {
+}
diff --git a/argv.template.go b/argv.template.go
new file mode 100644
index 0000000..cd4421d
--- /dev/null
+++ b/argv.template.go
@@ -0,0 +1,71 @@
+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/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) 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 2ab076e..73f2b9a 100644
--- a/main.go
+++ b/main.go
@@ -16,19 +16,12 @@ import (
 	"go.wit.com/log"
 )
 
-// sent via -ldflags
-var VERSION string
-var BUILDTIME string
-
-// used for shell auto completion
-var ARGNAME string = "zood"
-
 //go:embed resources/*
 var resources embed.FS
 
 func main() {
 	me = new(zoodStruct)
-	me.sh = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args
+	me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args
 
 	if argv.Daemon {
 		// turn off timestamps for STDOUT (systemd adds them)
@@ -40,13 +33,13 @@ func main() {
 
 	if argv.Status != nil {
 		log.Info("todo: show status here")
-		me.sh.GoodExit("says hi")
+		me.argv.GoodExit("says hi")
 	}
 
 	if err := testZoo(); err != nil {
 		log.Info("failed to connect. sleeping for 3 minutes")
 		time.Sleep(3 * time.Minute)
-		me.sh.BadExit("failed to connect to zookeeper", err)
+		me.argv.BadExit("failed to connect to zookeeper", err)
 	}
 	me.pollDelay = 3 * time.Second
 	me.failcountmax = 20 // die every minute if zookeeper can't be found
diff --git a/structs.go b/structs.go
index d3bd152..2a618a3 100644
--- a/structs.go
+++ b/structs.go
@@ -6,6 +6,7 @@ package main
 import (
 	"time"
 
+	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/lib/protobuf/zoopb"
 )
@@ -14,7 +15,10 @@ var me *zoodStruct
 
 // this app's variables
 type zoodStruct struct {
-	sh           *argvpb.Argv   // shell autocomplete
+	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
+
 	urlbase      string         // the dns name for the zookeeper
 	hostname     string         // my hostname
 	pollDelay    time.Duration  // how often to report our status