argv finally doesn't suckv0.0.32

8 files changed, 62 insertions, 130 deletions

diff --git a/argv.custom.go b/argv.custom.go
deleted file mode 100644
index c6774a5..0000000
--- a/argv.custom.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
-// Use of this source code is governed by the GPL 3.0
-
-package main
-
-import (
-	"os"
-
-	"go.wit.com/lib/protobuf/argvpb"
-)
-
-// sent via -ldflags
-var VERSION string
-var BUILDTIME string
-
-// used for shell auto completion
-var APPNAME string = "mirrors" // todo: get this from $0
-
-// sends the strings to bash or zsh that will be your options
-func (a args) SendCompletionStrings(pb *argvpb.Argv) {
-	base := []string{"--dry-run", "--force", "incoming", "walk", "list", "everything", "verify", "newest", "--create", "--verbose", "release"}
-
-	if pb.GetCmd() == "" {
-		pb.SendStrings(base)
-	} else {
-		pb.SubCommand(pb.Goargs...)
-	}
-	os.Exit(0)
-}
diff --git a/argv.struct.go b/argv.go
index e27a513..e27a513 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/complete.go b/complete.go
new file mode 100644
index 0000000..b7c7a47
--- /dev/null
+++ b/complete.go
@@ -0,0 +1,42 @@
+// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
+// Use of this source code is governed by the GPL 3.0
+
+package main
+
+import (
+	"fmt"
+	"strings"
+
+	"go.wit.com/dev/alexflint/arg"
+	"go.wit.com/lib/protobuf/argvpb"
+)
+
+// sent via -ldflags
+var VERSION string
+var BUILDTIME string
+
+// used for shell auto completion
+var APPNAME string = "mirrors" // todo: get this from $0
+
+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{"--dry-run", "--force", "incoming", "walk", "list", "everything", "verify", "newest", "--create", "--verbose", "release"}
+		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/doIncoming.go b/doIncoming.go
index d6dbed4..af8ac21 100644
--- a/doIncoming.go
+++ b/doIncoming.go
@@ -9,6 +9,7 @@ import (
 
 	"go.wit.com/lib/config"
 	"go.wit.com/lib/gui/shell"
+	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/lib/protobuf/zoopb"
 	"go.wit.com/log"
 )
@@ -60,7 +61,7 @@ func moveOutOfIncoming(fullname string) error {
 			// log.Printf("%s  moved incoming oldname %s newname: %s\n", packageName, path, newfilename)
 		}
 		// return "file already exists. use --force to replace", errors.New("duplicate .deb in incoming/")
-		me.argv.GoodExit("file already exists. TODO: fix this to use --force to replace")
+		argvpb.GoodExit("file already exists. TODO: fix this to use --force to replace")
 	}
 	// file can be moved
 	os.Rename(fullname, newfilename)
diff --git a/main.go b/main.go
index be9fe4d..89ae979 100644
--- a/main.go
+++ b/main.go
@@ -18,7 +18,7 @@ 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
 
 	// read in protobuf file
 	me.pb = zoopb.NewPackages()
@@ -26,7 +26,7 @@ func main() {
 	if err := me.pb.Load(); err != nil {
 		me.pb.BaseDir = env.GetPanic("BaseDir")
 		me.pb.Save()
-		me.argv.GoodExit("created new pb file: " + me.pb.Filename + ". rerun mirrors.")
+		argvpb.GoodExit("created new pb file: " + me.pb.Filename + ". rerun mirrors.")
 	}
 
 	// force check the PB variable
@@ -34,32 +34,32 @@ func main() {
 	if me.pb.BaseDir != env.GetPanic("BaseDir") {
 		me.pb.BaseDir = env.GetPanic("BaseDir")
 		me.pb.Save()
-		me.argv.BadExit("pb.BaseDir is bank", nil)
+		argvpb.BadExit("pb.BaseDir is bank", nil)
 	}
 
 	if err := os.Chdir(me.pb.BaseDir); err != nil {
-		me.argv.BadExit("no '"+me.pb.BaseDir+"' directory", err)
+		argvpb.BadExit("no '"+me.pb.BaseDir+"' directory", err)
 	}
 
 	if !shell.IsDir("pool/") {
-		me.argv.BadExit("no "+filepath.Join(me.pb.BaseDir, "pool")+" directory", errors.New("mount -a ? missing wit/pool/"))
+		argvpb.BadExit("no "+filepath.Join(me.pb.BaseDir, "pool")+" directory", errors.New("mount -a ? missing wit/pool/"))
 	}
 
-	if me.argv.GetCmd() == "" {
+	if argvpb.PB.GetCmd() == "" {
 		// STANDARD START
 		// walk for new .deb files
 		s, err := doWalk()
 		if err != nil {
-			me.argv.BadExit(s, err)
+			argvpb.BadExit(s, err)
 		}
 
 		// move files from inccoming into pooo/
 		s, err = doIncoming(me.pb)
 		if err != nil {
-			me.argv.BadExit(s, err)
+			argvpb.BadExit(s, err)
 		}
 
-		me.argv.GoodExit(s)
+		argvpb.GoodExit(s)
 		// STANDARD START END
 	}
 
@@ -99,19 +99,19 @@ func main() {
 		// move files to the right place
 		s, err = doIncoming(me.pb)
 		if err != nil {
-			me.argv.BadExit(s, err)
+			argvpb.BadExit(s, err)
 		}
 
 		// add the filenames to the .pb
 		s, err = doWalk()
 		if err != nil {
-			me.argv.BadExit(s, err)
+			argvpb.BadExit(s, err)
 		}
 
 		// verify all the packages
 		s, err = doVerify()
 		if err != nil {
-			me.argv.BadExit(s, err)
+			argvpb.BadExit(s, err)
 		}
 
 		// print a table of the newest packages
@@ -121,7 +121,7 @@ func main() {
 
 		err = doPurge()
 		if err != nil {
-			me.argv.BadExit("could not purge dists/", err)
+			argvpb.BadExit("could not purge dists/", err)
 		}
 
 		// make and GPG sign the Release files
@@ -153,7 +153,7 @@ func main() {
 	*/
 
 	if err != nil {
-		me.argv.BadExit(s, err)
+		argvpb.BadExit(s, err)
 	}
-	me.argv.GoodExit(s)
+	argvpb.GoodExit(s)
 }
diff --git a/makePackagesFile.go b/makePackagesFile.go
index f39093a..db83836 100644
--- a/makePackagesFile.go
+++ b/makePackagesFile.go
@@ -14,6 +14,7 @@ import (
 	"go.wit.com/lib/debian"
 	"go.wit.com/lib/env"
 	"go.wit.com/lib/gui/shell"
+	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/log"
 )
 
@@ -39,11 +40,11 @@ func makePackagesFile(arch string) (string, error) {
 	}
 
 	if err := os.Chdir(me.pb.BaseDir); err != nil {
-		me.argv.BadExit("no '"+me.pb.BaseDir+"' directory", err)
+		argvpb.BadExit("no '"+me.pb.BaseDir+"' directory", err)
 	}
 
 	if !shell.IsDir("pool/") {
-		me.argv.BadExit("no "+filepath.Join(me.pb.BaseDir, "pool")+" directory", errors.New("mount -a ? missing wit/pool/"))
+		argvpb.BadExit("no "+filepath.Join(me.pb.BaseDir, "pool")+" directory", errors.New("mount -a ? missing wit/pool/"))
 	}
 
 	log.Info("Processing dir", filepath.Join(me.pb.BaseDir, "pool"))
diff --git a/structs.go b/structs.go
index 2a9dec3..0c88682 100644
--- a/structs.go
+++ b/structs.go
@@ -5,7 +5,6 @@ import (
 
 	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/lib/fhelp"
-	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/zoopb"
 )
@@ -15,7 +14,6 @@ var me *mainType
 // this app's variables
 type mainType struct {
 	once  sync.Once       // one-time initialized data
-	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
 	forge *forgepb.Forge  // your customized repo preferences and settings