From 80d55ea478cb46de0da2d200173db11f804f0feb Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 26 Oct 2025 10:37:57 -0500 Subject: newer cleaner better argv --- argv.custom.go | 48 --------------------------------- argv.go | 21 +++++++++++++++ argv.struct.go | 21 --------------- argv.template.go | 81 -------------------------------------------------------- complete.go | 62 +++++++++++++++++++++++++++++++++++++++++++ main.go | 2 +- structs.go | 2 -- 7 files changed, 84 insertions(+), 153 deletions(-) delete mode 100644 argv.custom.go create mode 100644 argv.go delete mode 100644 argv.struct.go delete mode 100644 argv.template.go create mode 100644 complete.go diff --git a/argv.custom.go b/argv.custom.go deleted file mode 100644 index f1d2b08..0000000 --- a/argv.custom.go +++ /dev/null @@ -1,48 +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" - "go.wit.com/log" -) - -var VERSION string -var BUILDTIME string - -var APPNAME string = "zookeeper" - -func (a args) Description() string { - return ` - this daemon talks to zookeeper -` -} - -var NOW *log.LogFlag -var INFO *log.LogFlag -var ZOOD *log.LogFlag -var WARN *log.LogFlag - -func init() { - full := "go.wit.com/apps/zookeeper" - short := "zookeeper" - - NOW = log.NewFlag("NOW", true, full, short, "useful while doing debugging") - INFO = log.NewFlag("INFO", false, full, short, "general zookeeper") - ZOOD = log.NewFlag("ZOOD", false, full, short, "show reporting from zood") - WARN = log.NewFlag("WARN", true, full, short, "bad things") -} - -// sends the strings to bash or zsh that will be your options -func (a args) SendCompletionStrings(pb *argvpb.Argv) { - if pb.GetCmd() == "" { - base := []string{"gui", "list", "--daemon", "--version"} - pb.SendStrings(base) - } else { - pb.SubCommand(pb.Goargs...) - } - os.Exit(0) -} diff --git a/argv.go b/argv.go new file mode 100644 index 0000000..308132e --- /dev/null +++ b/argv.go @@ -0,0 +1,21 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + +package main + +var argv args + +type args struct { + Gui *EmptyCmd `arg:"subcommand:gui" help:"open the gui"` + List *EmptyCmd `arg:"subcommand:list" help:"list the machines in your zoo"` + Upgrade *EmptyCmd `arg:"subcommand:upgrade" help:"upgrade the machines"` + Verbose bool `arg:"--verbose" default:"false" help:"talk more"` + Daemon bool `arg:"--daemon" default:"false" help:"run in daemon mode"` + Port int `arg:"--port" default:"8080" help:"port to run on"` + NoPort bool `arg:"--no-port" help:"don't open socket"` + Bash bool `arg:"--bash" help:"generate bash completion"` + BashAuto []string `arg:"--auto-complete" help:"todo: move this to go-arg"` +} + +type EmptyCmd struct { +} diff --git a/argv.struct.go b/argv.struct.go deleted file mode 100644 index 308132e..0000000 --- a/argv.struct.go +++ /dev/null @@ -1,21 +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 - -var argv args - -type args struct { - Gui *EmptyCmd `arg:"subcommand:gui" help:"open the gui"` - List *EmptyCmd `arg:"subcommand:list" help:"list the machines in your zoo"` - Upgrade *EmptyCmd `arg:"subcommand:upgrade" help:"upgrade the machines"` - Verbose bool `arg:"--verbose" default:"false" help:"talk more"` - Daemon bool `arg:"--daemon" default:"false" help:"run in daemon mode"` - Port int `arg:"--port" default:"8080" help:"port to run on"` - NoPort bool `arg:"--no-port" help:"don't open socket"` - Bash bool `arg:"--bash" help:"generate bash completion"` - BashAuto []string `arg:"--auto-complete" help:"todo: move this to go-arg"` -} - -type EmptyCmd struct { -} 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..23f40f5 --- /dev/null +++ b/complete.go @@ -0,0 +1,62 @@ +// 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" + "go.wit.com/log" +) + +var VERSION string +var BUILDTIME string + +var APPNAME string = "zookeeper" + +func (a args) Description() string { + return ` + this daemon talks to zookeeper +` +} + +var NOW *log.LogFlag +var INFO *log.LogFlag +var ZOOD *log.LogFlag +var WARN *log.LogFlag + +func init() { + full := "go.wit.com/apps/zookeeper" + short := "zookeeper" + + NOW = log.NewFlag("NOW", true, full, short, "useful while doing debugging") + INFO = log.NewFlag("INFO", false, full, short, "general zookeeper") + ZOOD = log.NewFlag("ZOOD", false, full, short, "show reporting from zood") + WARN = log.NewFlag("WARN", true, full, short, "bad things") +} + +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{"gui", "list", "--daemon", "--version"} + 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/main.go b/main.go index afcf81b..1d50e50 100644 --- a/main.go +++ b/main.go @@ -16,7 +16,7 @@ import ( 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 if argv.Daemon { // turn off timestamps for STDOUT (systemd adds them) diff --git a/structs.go b/structs.go index 1840217..2036f7b 100644 --- a/structs.go +++ b/structs.go @@ -10,7 +10,6 @@ import ( "go.wit.com/gui" "go.wit.com/lib/fhelp" "go.wit.com/lib/gadgets" - "go.wit.com/lib/protobuf/argvpb" "go.wit.com/lib/protobuf/forgepb" "go.wit.com/lib/protobuf/zoopb" ) @@ -19,7 +18,6 @@ var me *mainType // this app's variables type mainType struct { - 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 -- cgit v1.2.3