newer but still not right argvv0.0.64

7 files changed, 109 insertions, 49 deletions

diff --git a/argv.custom.go b/argv.custom.go
new file mode 100644
index 0000000..948b90d
--- /dev/null
+++ b/argv.custom.go
@@ -0,0 +1,23 @@
+package main
+
+import (
+	"os"
+
+	"go.wit.com/lib/protobuf/argvpb"
+)
+
+// are sent via -ldflags at buildtime
+var VERSION string
+var BUILDTIME string
+var APPNAME string = "forged"
+
+// sends the strings to bash or zsh that will be your options
+func (a args) SendCompletionStrings(pb *argvpb.Argv) {
+	if pb.Cmd == "" {
+		base := []string{"--bash", "repos", "gui", "patches", "--daemon", "missing"}
+		pb.SendStrings(base)
+	} else {
+		pb.SubCommand(pb.Goargs...)
+	}
+	os.Exit(0)
+}
diff --git a/argv.go b/argv.struct.go
index 9cfcd5d..ac67ed8 100644
--- a/argv.go
+++ b/argv.struct.go
@@ -1,16 +1,5 @@
 package main
 
-/*
-	this parses the command line arguements
-	this enables command line options from other packages like 'gui' and 'log'
-*/
-
-import (
-	"os"
-
-	"go.wit.com/lib/protobuf/argvpb"
-)
-
 var argv args
 
 type args struct {
@@ -45,30 +34,3 @@ type ReposCmd struct {
 	// Clean  *EmptyCmd `arg:"subcommand:clean"         help:"clean the repos"`
 	// Merge  *EmptyCmd `arg:"subcommand:merge"         help:"merge in new patchsets"`
 }
-
-func (args) Appname() string {
-	return ARGNAME
-}
-
-func (args) Buildtime() (string, string) {
-	return BUILDTIME, VERSION
-}
-
-/*
-	handles shell autocomplete
-*/
-
-func (args) Version() string {
-	return argvpb.StandardVersion(ARGNAME, VERSION, BUILDTIME)
-}
-
-// sends the strings to bash or zsh that will be your options
-func (a args) SendCompletionStrings(pb *argvpb.Argv) {
-	if pb.Cmd == "" {
-		base := []string{"--bash", "repos", "gui", "patches", "--daemon", "missing"}
-		pb.SendStrings(base)
-	} else {
-		pb.SubCommand(pb.Goargs...)
-	}
-	os.Exit(0)
-}
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/config.go b/config.go
index b6b8f52..72f1caf 100644
--- a/config.go
+++ b/config.go
@@ -23,7 +23,7 @@ func configInit() *forgepb.ForgeConfigs {
 	}
 
 	configs := new(forgepb.ForgeConfigs)
-	err := config.ConfigLoad(configs, ARGNAME, "forge")
+	err := config.ConfigLoad(configs, APPNAME, "forge")
 	if errors.Is(err, os.ErrNotExist) {
 		configs.ReposDir = "/var/cache/forged"
 		configs.ReposPB = filepath.Join(configs.ReposDir, "repos.pb")
diff --git a/http.go b/http.go
index ad1e2c0..128de8b 100644
--- a/http.go
+++ b/http.go
@@ -30,7 +30,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 
 	if route == "/" {
 		w.Header().Set("Content-Type", "text")
-		fmt.Fprintf(w, "go.wit.com/apps/utils/forged Version: %s\n", argv.Version())
+		fmt.Fprintf(w, "go.wit.com/apps/utils/forged Version: %s\n", me.argv.Version())
 		fmt.Fprintf(w, "\n")
 		return
 	}
diff --git a/main.go b/main.go
index 47d9a43..4a4e39c 100644
--- a/main.go
+++ b/main.go
@@ -15,11 +15,6 @@ import (
 	"go.wit.com/log"
 )
 
-// are sent via -ldflags at buildtime
-var VERSION string
-var BUILDTIME string
-var ARGNAME string = "forged"
-
 //go:embed resources/*
 var resources embed.FS
 
@@ -35,7 +30,6 @@ func saveMissing() error {
 
 func main() {
 	me = new(mainType)
-	me.myGui = argvpb.Gui()              // prepares the GUI package for go-args
 	me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args
 
 	me.forge = forgepb.InitByFullpath("/etc/forged/forge.text")
diff --git a/structs.go b/structs.go
index f34345a..f6a09ea 100644
--- a/structs.go
+++ b/structs.go
@@ -5,6 +5,7 @@ package main
 
 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/gitpb"
@@ -14,10 +15,10 @@ var me *mainType
 
 // this app's variables
 type mainType struct {
-	argv    *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   *argvpb.GuiPrep       // the gui toolkit handle
-	forge   *forgepb.Forge        // for holding the forge protobuf files
+	myGui   *fhelp.GuiPrep        // for initializing the GUI toolkits
+	forge   *forgepb.Forge        // your customized repo preferences and settings
 	configs *forgepb.ForgeConfigs // for holding the forge protobuf files
 	missing *gitpb.Repos          // repos we are missing
 }