diff options
| -rw-r--r-- | argv.custom.go | 25 | ||||
| -rw-r--r-- | argv.go | 48 | ||||
| -rw-r--r-- | argv.struct.go | 14 | ||||
| -rw-r--r-- | argv.template.go | 80 | ||||
| -rw-r--r-- | http.go | 2 | ||||
| -rw-r--r-- | main.go | 13 | ||||
| -rw-r--r-- | structs.go | 8 |
7 files changed, 129 insertions, 61 deletions
diff --git a/argv.custom.go b/argv.custom.go new file mode 100644 index 0000000..91bab5b --- /dev/null +++ b/argv.custom.go @@ -0,0 +1,25 @@ +package main + +import ( + "os" + + "go.wit.com/lib/protobuf/argvpb" +) + +// are sent via -ldflags at buildtime +var VERSION string +var BUILDTIME string + +// used for shell auto completion +var APPNAME string = "gowebd" + +// sends the strings to bash or zsh that will be your options +func (a args) SendCompletionStrings(pb *argvpb.Argv) { + if pb.Cmd == "" { + base := []string{"test", "--version", "--force"} + pb.SendStrings(base) + } else { + pb.SubCommand(pb.Goargs...) + } + os.Exit(0) +} diff --git a/argv.go b/argv.go deleted file mode 100644 index 1ac80c9..0000000 --- a/argv.go +++ /dev/null @@ -1,48 +0,0 @@ -package main - -import ( - "os" - - "go.wit.com/lib/protobuf/argvpb" -) - -/* - this parses the command line arguements - this enables command line options from other packages like 'gui' and 'log' -*/ - -var argv args - -type args struct { - Test *EmptyCmd `arg:"subcommand:test" help:"test repomap"` - ListRepos bool `arg:"--list-repos" help:"list all repositories"` - Port int `arg:"--port" default:"2520" help:"port to run on"` - RepoMap string `arg:"--repomap" default:"/etc/gowebd/repomap" help:"repomap file"` - Hostname string `arg:"--hostname" default:"go.wit.com" help:"hostname to use"` -} - -type EmptyCmd struct { -} - -func (args) Version() string { - return argvpb.StandardVersion(ARGNAME, VERSION, BUILDTIME) -} - -func (args) Buildtime() (string, string) { - return BUILDTIME, VERSION -} - -func (args) Appname() string { - return ARGNAME -} - -// sends the strings to bash or zsh that will be your options -func (a args) SendCompletionStrings(pb *argvpb.Argv) { - if pb.Cmd == "" { - base := []string{"test", "--version", "--force"} - pb.SendStrings(base) - } else { - pb.SubCommand(pb.Goargs...) - } - os.Exit(0) -} diff --git a/argv.struct.go b/argv.struct.go new file mode 100644 index 0000000..93b4f42 --- /dev/null +++ b/argv.struct.go @@ -0,0 +1,14 @@ +package main + +var argv args + +type args struct { + Test *EmptyCmd `arg:"subcommand:test" help:"test repomap"` + ListRepos bool `arg:"--list-repos" help:"list all repositories"` + Port int `arg:"--port" default:"2520" help:"port to run on"` + RepoMap string `arg:"--repomap" default:"/etc/gowebd/repomap" help:"repomap file"` + Hostname string `arg:"--hostname" default:"go.wit.com" help:"hostname to use"` +} + +type EmptyCmd struct { +} 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 +} @@ -80,7 +80,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) { if route == "/lookup" { w.Header().Set("Content-Type", "text") - fmt.Fprintf(w, "go.wit.com/apps/utils/gowebd Version: %s\n", argv.Version()) + fmt.Fprintf(w, "go.wit.com/apps/utils/gowebd Version: %s\n", me.argv.Version()) fmt.Fprintf(w, "\n") all := me.forge.Repos.SortByFullPath() @@ -12,16 +12,9 @@ import ( "go.wit.com/log" ) -// are sent via -ldflags at buildtime -var VERSION string -var BUILDTIME string - //go:embed resources/* var resources embed.FS -// used for shell auto completion -var ARGNAME string = "gowebd" - var repoMap map[string]string var gitMap map[string]*gitpb.Repo var configfile []string @@ -34,7 +27,7 @@ var LIBDIR string = "/var/lib/gowebd/" func main() { me = new(mainType) - me.sh = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args + me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args if argv.RepoMap != "" { REPOMAP = argv.RepoMap @@ -53,9 +46,9 @@ func main() { if argv.Test != nil { if s, err := newMakeRepomap(); err != nil { - me.sh.BadExit(s, err) + me.argv.BadExit(s, err) } else { - me.sh.GoodExit(s) + me.argv.GoodExit(s) } } @@ -4,6 +4,8 @@ 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" ) @@ -12,6 +14,8 @@ var me *mainType // this app's variables type mainType struct { - sh *argvpb.Argv // shell autocomplete - forge *forgepb.Forge // for holding the forge protobuf files + 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 } |