diff options
| -rw-r--r-- | argv.custom.go | 48 | ||||
| -rw-r--r-- | argv.go | 81 | ||||
| -rw-r--r-- | argv.struct.go | 21 | ||||
| -rw-r--r-- | argv.template.go | 80 | ||||
| -rw-r--r-- | main.go | 5 | ||||
| -rw-r--r-- | structs.go | 9 |
6 files changed, 156 insertions, 88 deletions
diff --git a/argv.custom.go b/argv.custom.go new file mode 100644 index 0000000..d0b3029 --- /dev/null +++ b/argv.custom.go @@ -0,0 +1,48 @@ +// 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.Cmd == "" { + 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 deleted file mode 100644 index c56b277..0000000 --- a/argv.go +++ /dev/null @@ -1,81 +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 - -/* - 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" - "go.wit.com/log" -) - -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 { -} - -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") -} - -/* - handles shell autocomplete -*/ - -func (args) Version() string { - return argvpb.StandardVersion(ARGNAME, VERSION, BUILDTIME) -} - -func (args) Appname() string { - return ARGNAME -} - -func (args) Buildtime() (string, string) { - return BUILDTIME, VERSION -} - -// sends the strings to bash or zsh that will be your options -func (a args) SendCompletionStrings(pb *argvpb.Argv) { - if pb.Cmd == "" { - base := []string{"gui", "list", "--daemon", "--version"} - 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..308132e --- /dev/null +++ b/argv.struct.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.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 +} @@ -14,11 +14,6 @@ import ( "go.wit.com/log" ) -var VERSION string -var BUILDTIME string - -var ARGNAME string = "zookeeper" - func main() { me = new(mainType) me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args @@ -6,9 +6,12 @@ package main import ( "time" + "go.wit.com/dev/alexflint/arg" "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" ) @@ -16,7 +19,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 *fhelp.GuiPrep // for initializing the GUI toolkits + forge *forgepb.Forge // your customized repo preferences and settings hostname string // my fqdn dns zookeeper hostname pollDelay time.Duration // how often to report our status dog *time.Ticker // the watchdog timer @@ -26,7 +32,6 @@ type mainType struct { machines *zoopb.Machines // every machine that has reported itself to the zookeeper targets map[string]string // what versions the machines should be running upgrade map[string]bool // use this to trigger builds - myGui *argvpb.GuiPrep // the gui toolkit handle machinesWin *gadgets.GenericWindow // the machines gui window machinesBox *gui.Node // the machines gui parent box widget machinesTB *zoopb.MachinesTable // the machines gui table buffer |