thank goodness. not really. argv is still a messv0.0.33

5 files changed, 119 insertions, 52 deletions

diff --git a/argv.custom.go b/argv.custom.go
new file mode 100644
index 0000000..8bfb547
--- /dev/null
+++ b/argv.custom.go
@@ -0,0 +1,28 @@
+// 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 = "fixup" // todo: get this from $0 ?
+
+// sends the strings to bash or zsh that will be your options
+func (a args) SendCompletionStrings(pb *argvpb.Argv) {
+	if pb.Cmd == "" {
+		base := []string{"drives", "gui", "--version"}
+		pb.SendStrings(base)
+	} else {
+		pb.SubCommand(pb.Goargs...)
+	}
+	os.Exit(0)
+}
diff --git a/argv.go b/argv.struct.go
index 6d9e4ba..18ba31f 100644
--- a/argv.go
+++ b/argv.struct.go
@@ -3,17 +3,6 @@
 
 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 {
@@ -36,30 +25,3 @@ type args struct {
 
 type EmptyCmd struct {
 }
-
-/*
-	handles shell autocomplete
-*/
-
-func (args) Appname() string {
-	return ARGNAME
-}
-
-func (args) Buildtime() (string, string) {
-	return BUILDTIME, VERSION
-}
-
-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{"drives", "gui", "--version"}
-		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/main.go b/main.go
index 81033dc..9e1be02 100644
--- a/main.go
+++ b/main.go
@@ -16,13 +16,6 @@ import (
 	"go.wit.com/log"
 )
 
-// sent via -ldflags
-var VERSION string
-var BUILDTIME string
-
-// used for shell auto completion
-var ARGNAME string = "fixup" // todo: get this from $0 ?
-
 //go:embed resources/*
 var resources embed.FS
 
diff --git a/structs.go b/structs.go
index e40c8a9..49d11a9 100644
--- a/structs.go
+++ b/structs.go
@@ -4,7 +4,9 @@
 package main
 
 import (
+	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/gui"
+	"go.wit.com/lib/fhelp"
 	"go.wit.com/lib/protobuf/argvpb"
 )
 
@@ -12,11 +14,13 @@ var me *autoType
 
 // this app's variables
 type autoType struct {
-	argv         *argvpb.Argv    // shell autocomplete
-	myGui        *argvpb.GuiPrep // the gui toolkit handle
-	dd           *gui.Node       // the drives dropdown list
-	parted       *gui.Node       // the current drive to run parted on
-	currentDev   *Block          // the current dev entry to work on
-	pb           *Blocks         // the block dev protobuf
-	driveInfoBox *gui.Node       // displays the drive info
+	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
+	gui          *gui.Node      // the drives dropdown list
+	dd           *gui.Node      // the drives dropdown list
+	parted       *gui.Node      // the current drive to run parted on
+	currentDev   *Block         // the current dev entry to work on
+	pb           *Blocks        // the block dev protobuf
+	driveInfoBox *gui.Node      // displays the drive info
 }