more cleanups

2 files changed, 26 insertions, 99 deletions

diff --git a/argv.custom.go b/argv.custom.go
index 2b4f1f2..987a812 100644
--- a/argv.custom.go
+++ b/argv.custom.go
@@ -10,8 +10,10 @@ import (
 	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/gui"
 	"go.wit.com/lib/debugger"
+	"go.wit.com/lib/env"
 	"go.wit.com/lib/fhelp"
 	"go.wit.com/lib/protobuf/argvpb"
+	"go.wit.com/log"
 )
 
 // sent via -ldflags // is there a better way?
@@ -21,8 +23,30 @@ var BUILDTIME string
 // used for shell auto completion
 var APPNAME string = "forge"
 
-func (args) Buildtime() (string, string) {
-	return BUILDTIME, VERSION
+func (args) InitArgv() (string, string, string) {
+	return APPNAME, BUILDTIME, VERSION
+}
+
+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() because env.Verbose() == true")
+	}
+	// remove this from the template for your app (or make one for youself if you need it)
+	forgeExit() // custom forge shutdown function
+}
+
+func (args) MustParse() error {
+	me.pp = arg.MustParse(&argv)
+	return nil
 }
 
 func (a args) Description() string {
@@ -37,20 +61,6 @@ forge -- a tool to manage lots of git repos. forge includes a GUI and TUI.
 `
 }
 
-/*
-func ifBlank(arg string) bool {
-	if arg == "''" {
-		// if empty, the user has not typed something
-		return true
-	}
-	return false
-}
-*/
-
-func (args) Appname() string {
-	return APPNAME
-}
-
 // arg.Register(&argGui)
 // log.Info("ArgvGui() started")
 func (args) ArgvGui() error {
@@ -110,9 +120,6 @@ func (a args) SendCompletionStrings(pb *argvpb.Argv) {
 		me.pp, err = arg.ParseFlagsArgv(&argv)
 		fmt.Fprintf(argvpb.Stderr, "returned from parseFlagsArgv(%v)\n", err)
 	}
-	// matches := []string{"show", "repos"}
-	// err = me.pp.WriteHelpForAutocomplete(argvpb.PB.Partial, matches...)
-	// fmt.Fprintf(argvpb.Stderr, "returned from WriteHelpForAutocomplete() matches(%v)\n", matches)
 	err = me.pp.WriteHelpForAutocomplete(argvpb.PB.Partial, argvpb.PB.Real...)
 	fmt.Fprintf(argvpb.Stderr, "returned from WriteHelpForAutocomplete() pb.Real(%v)\n", pb.Real)
 	fmt.Fprintf(argvpb.Stderr, "returned from WriteHelpForAutocomplete(%v)\n", err)
diff --git a/argv.template.go b/argv.template.go
deleted file mode 100644
index 1f827aa..0000000
--- a/argv.template.go
+++ /dev/null
@@ -1,80 +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 (
-	"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() error {
-	var err error
-	if me.pp == nil {
-		// log.Info("Parse Flags GOT flags:", flags)
-		me.pp, err = arg.ParseFlagsArgv(&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() error {
-	me.pp.WriteHelpForSubcommandArgv()
-	return nil
-}
-
-// this will print the help for the subcmd
-func (args) WriteHelpForAutocomplete() error {
-	return me.pp.WriteHelpForAutocompleteArgv()
-}
-
-func (args) WriteHelpForAutocompleteDebug() error {
-	return me.pp.WriteHelpForAutocompleteArgv()
-}
-
-// add this funcgion: this will print the help
-func (args) WriteHelp() error {
-	me.pp.WriteHelpArgv()
-	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() because env.Verbose() == true")
-	}
-	// 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
-}