new argv (much better than before)v0.22.170

8 files changed, 77 insertions, 142 deletions

diff --git a/argv.custom.go b/argv.custom.go
deleted file mode 100644
index 0c4d6e1..0000000
--- a/argv.custom.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package main
-
-import (
-	"os"
-
-	"go.wit.com/lib/protobuf/argvpb"
-)
-
-// sent from -ldflags
-var VERSION string
-var BUILDTIME string
-
-var APPNAME string = "go-deb"
-
-/*
-	this parses the command line arguements
-
-	this enables command line options from other packages like 'gui' and 'log'
-*/
-
-func (args) Examples() string {
-	var out string
-	out += "go-deb --dir ~/incoming/ --repo .   # build a .deb of the current directory\n"
-	return out
-}
-
-func (a args) Description() string {
-	return `
-Example usage:
-	go-deb --repo go.wit.com/apps/go-clone "
-
-this is a work in progress`
-}
-
-// sends the strings to bash or zsh that will be your options
-func (a args) SendCompletionStrings(pb *argvpb.Argv) {
-	if pb.GetCmd() == "" {
-		base := []string{"dump", "gui", "show", "--version", "--keep-files", "--buildversion"}
-		pb.SendStrings(base)
-	} else {
-		pb.SubCommand(pb.Goargs...)
-	}
-	os.Exit(0)
-}
diff --git a/argv.struct.go b/argv.go
index d47a5e7..d47a5e7 100644
--- a/argv.struct.go
+++ b/argv.go
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/build.go b/build.go
index 0c95e71..c22d40c 100644
--- a/build.go
+++ b/build.go
@@ -10,6 +10,7 @@ import (
 
 	"go.wit.com/lib/debian"
 	"go.wit.com/lib/gui/shell"
+	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
 )
@@ -198,14 +199,14 @@ func buildPackage(repo *gitpb.Repo) (bool, error) {
 
 	r := repo.Run([]string{"du", "-s"})
 	if len(r.Stdout) != 1 {
-		me.argv.BadExit("du -s files/ failed", r.Error)
+		argvpb.BadExit("du -s files/ failed", r.Error)
 	}
 	me.pb.DebInfo.InstalledSize = strings.Fields(r.Stdout[0])[0]
 	controlfile := debian.MakeControlFile(me.pb)
 	controlfile += "\n"
 	log.Info(controlfile)
 	if err := os.WriteFile("files/DEBIAN/control", []byte(controlfile), 0644); err != nil {
-		me.argv.BadExit("write err files/DEBIAN/control", err)
+		argvpb.BadExit("write err files/DEBIAN/control", err)
 	}
 
 	cmd := []string{"dpkg-deb", "--root-owner-group", "--build", "files", fulldebname}
diff --git a/complete.go b/complete.go
new file mode 100644
index 0000000..9edbbc1
--- /dev/null
+++ b/complete.go
@@ -0,0 +1,58 @@
+package main
+
+import (
+	"fmt"
+	"strings"
+
+	"go.wit.com/dev/alexflint/arg"
+	"go.wit.com/lib/protobuf/argvpb"
+)
+
+// sent from -ldflags
+var VERSION string
+var BUILDTIME string
+
+var APPNAME string = "go-deb"
+
+/*
+	this parses the command line arguements
+
+	this enables command line options from other packages like 'gui' and 'log'
+*/
+
+func (args) Examples() string {
+	var out string
+	out += "go-deb --dir ~/incoming/ --repo .   # build a .deb of the current directory\n"
+	return out
+}
+
+func (a args) Description() string {
+	return `
+Example usage:
+	go-deb --repo go.wit.com/apps/go-clone
+
+this is a work in progress`
+}
+
+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{"dump", "gui", "show", "--version", "--keep-files", "--buildversion"}
+		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/doGui.go b/doGui.go
index bd71f80..d073423 100644
--- a/doGui.go
+++ b/doGui.go
@@ -4,6 +4,7 @@
 package main
 
 import (
+	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/log"
 )
 
@@ -11,7 +12,7 @@ import (
 
 func doGui() {
 	log.Info("The GUI is disabled for now. This app is under development currently")
-	me.argv.GoodExit("it works fine from the command line")
+	argvpb.GoodExit("it works fine from the command line")
 }
 
 /*
diff --git a/main.go b/main.go
index 843952f..e143d3f 100644
--- a/main.go
+++ b/main.go
@@ -18,12 +18,12 @@ var resources embed.FS
 
 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
 	me.pb = new(zoopb.Package)
 
 	wd, err := os.Getwd()
 	if err != nil {
-		me.argv.BadExit("your current directory does not exist err=", err)
+		argvpb.BadExit("your current directory does not exist err=", err)
 	}
 
 	if argv.Arch == "" {
@@ -33,7 +33,7 @@ func main() {
 
 	me.repo, err = gitpb.NewRepo(wd)
 	if err != nil {
-		me.argv.BadExit("is this really a .git directory? err=", err)
+		argvpb.BadExit("is this really a .git directory? err=", err)
 	}
 
 	data, err := os.ReadFile("control")
@@ -68,7 +68,7 @@ func main() {
 	controlfile := debian.MakeControlFile(me.pb)
 	log.Info(controlfile)
 	log.Info("INITIAL PARSE END")
-	// me.argv.GoodExit("rewriting this app")
+	//  argvpb.GoodExit("rewriting this app")
 
 	// build()
 	if argv.Show != nil {
@@ -103,18 +103,20 @@ func main() {
 		// computeControlValues(me.repo)
 	*/
 
-	if me.argv.Gui() {
-		// only load teh toolkit if you get this far
-		me.myGui.Start() // loads the GUI toolkit
-		doGui()
-		debug()
-	}
+	/*
+		if argvpb.Gui() {
+			// only load teh toolkit if you get this far
+			me.myGui.Start() // loads the GUI toolkit
+			doGui()
+			debug()
+		}
+	*/
 
 	log.Info("go-deb: attempting to build package")
 	if ok, err := buildPackage(me.repo); ok {
-		me.argv.GoodExit("build worked")
+		argvpb.GoodExit("build worked")
 	} else {
-		me.argv.BadExit("build failed", err)
+		argvpb.BadExit("build failed", err)
 	}
 	os.Exit(0)
 }
diff --git a/structs.go b/structs.go
index a9e6516..6395bc5 100644
--- a/structs.go
+++ b/structs.go
@@ -5,7 +5,6 @@ import (
 	"go.wit.com/gui"
 	"go.wit.com/lib/fhelp"
 	"go.wit.com/lib/gadgets"
-	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/lib/protobuf/zoopb"
 )
@@ -14,7 +13,6 @@ var me *mainType
 
 // this app's variables
 type mainType struct {
-	argv    *argvpb.Argv   // shell autocomplete
 	pp      *arg.Parser    // for parsing the command line args.  Yay to alexf lint!
 	myGui   *fhelp.GuiPrep // the gui handle itself
 	origGui *gui.Node      // the gui handle itself