new argvHEADv0.21.69v0.21.68guimasterdevel

6 files changed, 51 insertions, 122 deletions

diff --git a/argv.custom.go b/argv.custom.go
deleted file mode 100644
index 00f8d7b..0000000
--- a/argv.custom.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package main
-
-import (
-	"os"
-
-	"go.wit.com/lib/protobuf/argvpb"
-)
-
-// this is where to customize argv for your application
-
-var APPNAME string = "basicwindow"
-
-// sent via -ldflags
-var VERSION string
-var BUILDTIME string
-
-func (a args) Description() string {
-	return `
-This basicwindow example demonstrates multiple windows
-`
-}
-
-// sends the strings to bash or zsh that will be your options
-func (a args) SendCompletionStrings(pb *argvpb.Argv) {
-	if pb.GetCmd() == "" {
-		// these are base autocomplete strings
-		matches := []string{"--bash", "--version", "demo", "gui"}
-		pb.SendStrings(matches)
-	} else {
-		// autogenerate the strings for the subcommand using github.com/alexflint/go-arg
-		pb.GenerateSubCommandStrings(pb.Goargs...)
-	}
-	os.Exit(0)
-}
diff --git a/argv.struct.go b/argv.go
index 41c5a7a..48a7dbd 100644
--- a/argv.struct.go
+++ b/argv.go
@@ -3,7 +3,7 @@ package main
 var argv args
 
 type args struct {
-	Demo         *EmptyCmd    `arg:"subcommand:demo"                      help:"this is just a demo"`
+	Demo *EmptyCmd `arg:"subcommand:demo"                      help:"this is just a demo"`
 	// Demo string `arg:"positional"                   help:"this is just a demo"`
 }
 
diff --git a/argv.template.go b/argv.template.go
deleted file mode 100644
index 6948afe..0000000
--- a/argv.template.go
+++ /dev/null
@@ -1,81 +0,0 @@
-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/env"
-	"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 env.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/complete.go b/complete.go
new file mode 100644
index 0000000..a4fab62
--- /dev/null
+++ b/complete.go
@@ -0,0 +1,46 @@
+package main
+
+import (
+	"fmt"
+	"strings"
+
+	"go.wit.com/lib/protobuf/argvpb"
+	"go.wit.com/dev/alexflint/arg"
+)
+
+// this is where to customize argv for your application
+
+var APPNAME string = "basicwindow"
+
+// sent via -ldflags
+var VERSION string
+var BUILDTIME string
+
+func (a args) Description() string {
+	return `
+This basicwindow example demonstrates multiple windows
+`
+}
+
+func (args) MustParse() error {
+	me.pp = arg.MustParse(&argv)
+	return nil
+}
+
+// sends the strings to bash or zsh that will be your options
+func (a args) DoAutoComplete() error {
+	if argvpb.PB.GetCmd() == "" {
+		matches := []string{"--bash", "--version", "demo", "gui"}
+		fmt.Fprintf(argvpb.Stdout, " %s", strings.Join(matches, " "))
+		return nil
+	}
+	var err error
+	if me.pp == nil {
+		me.pp, err = arg.ParseFlagsArgv(&argv)
+		if err != nil {
+			return err
+		}
+	}
+	err = me.pp.WriteHelpForAutocomplete(argvpb.PB.Partial, argvpb.PB.Real...)
+	return err
+}
diff --git a/main.go b/main.go
index a775f03..8f767df 100644
--- a/main.go
+++ b/main.go
@@ -21,7 +21,7 @@ var colors *gui.Node
 
 func main() {
 	me = new(mainType)
-	me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args
+	argvpb.Init(&argv, APPNAME, BUILDTIME, VERSION) // adds shell auto-complete
 
 	helloworld()
 	basicWindow = makebasicWindow()
@@ -43,7 +43,7 @@ func helloworld() {
 	mainWindow.Show()
 	mainWindow.Custom = func() {
 		log.Info("window closed")
-		me.argv.GoodExit("gui closed")
+		 argvpb.GoodExit("gui closed")
 	}
 
 	box := mainWindow.NewBox("vbox", false)
diff --git a/structs.go b/structs.go
index 7caffda..0701e9c 100644
--- a/structs.go
+++ b/structs.go
@@ -7,15 +7,13 @@ import (
 	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/gui"
 	"go.wit.com/lib/fhelp"
-	"go.wit.com/lib/protobuf/argvpb"
 )
 
 var me *mainType
 
 // this app's variables
 type mainType struct {
-	argv  *argvpb.Argv // shell autocomplete
-	pp    *arg.Parser  // the go-arg parser of the command line
-	gui   *gui.Node    // the gui toolkit handle
+	pp    *arg.Parser // the go-arg parser of the command line
+	gui   *gui.Node   // the gui toolkit handle
 	myGui *fhelp.GuiPrep
 }