From dee05f9efde26a1b3a781781262cd49a6750f6bc Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 26 Oct 2025 10:38:08 -0500 Subject: finally working again argv --- argv.custom.go | 49 ---------------------------------- argv.go | 19 +++++++++++++ argv.struct.go | 19 ------------- argv.template.go | 81 -------------------------------------------------------- complete.go | 63 +++++++++++++++++++++++++++++++++++++++++++ main.go | 2 +- structs.go | 2 -- 7 files changed, 83 insertions(+), 152 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 75d7294..0000000 --- a/argv.custom.go +++ /dev/null @@ -1,49 +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 = "gus" - -func (a args) Description() string { - return ` - "Phantastic Gus" your network squirrel - - * Meet [the Phantastic squirrel Gus](https://www.youtube.com/watch?v=hFZFjoX2cGg) -` -} - -var NOW *log.LogFlag -var INFO *log.LogFlag -var PING *log.LogFlag -var WARN *log.LogFlag - -func init() { - full := "go.wit.com/lib/daemon/gus" - short := "zood" - - NOW = log.NewFlag("NOW", true, full, short, "useful while doing debugging") - INFO = log.NewFlag("INFO", false, full, short, "general gus") - 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{"--bash", "--me", "gui", "--daemon"} - 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..3d0b0c2 --- /dev/null +++ b/argv.go @@ -0,0 +1,19 @@ +// 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"` + Verbose bool `arg:"--verbose" help:"talk more"` + Daemon bool `arg:"--daemon" default:"false" help:"run in daemon mode"` + UseME bool `arg:"--me" help:"use /me to connect"` + Port int `arg:"--port" default:"2522" help:"port to run on"` + URL string `arg:"--url" help:"url to use"` + Config string `arg:"--config" help:"config file (default is ~/.config/cloud/gus.text"` +} + +type EmptyCmd struct { +} diff --git a/argv.struct.go b/argv.struct.go deleted file mode 100644 index 3d0b0c2..0000000 --- a/argv.struct.go +++ /dev/null @@ -1,19 +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"` - Verbose bool `arg:"--verbose" help:"talk more"` - Daemon bool `arg:"--daemon" default:"false" help:"run in daemon mode"` - UseME bool `arg:"--me" help:"use /me to connect"` - Port int `arg:"--port" default:"2522" help:"port to run on"` - URL string `arg:"--url" help:"url to use"` - Config string `arg:"--config" help:"config file (default is ~/.config/cloud/gus.text"` -} - -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..2e2f7c3 --- /dev/null +++ b/complete.go @@ -0,0 +1,63 @@ +// 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 = "gus" + +func (a args) Description() string { + return ` + "Phantastic Gus" your network squirrel + + * Meet [the Phantastic squirrel Gus](https://www.youtube.com/watch?v=hFZFjoX2cGg) +` +} + +var NOW *log.LogFlag +var INFO *log.LogFlag +var PING *log.LogFlag +var WARN *log.LogFlag + +func init() { + full := "go.wit.com/lib/daemon/gus" + short := "zood" + + NOW = log.NewFlag("NOW", true, full, short, "useful while doing debugging") + INFO = log.NewFlag("INFO", false, full, short, "general gus") + 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{"--bash", "--me", "gui", "--daemon"} + 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 28f0428..70795b8 100644 --- a/main.go +++ b/main.go @@ -26,7 +26,7 @@ var resources embed.FS func main() { me = new(gusconf) - me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args + argvpb.Init(&argv, APPNAME, BUILDTIME, VERSION) // adds shell auto-complete log.Info("tmp hack", uuid.New().String()) diff --git a/structs.go b/structs.go index 8c54a0b..88fcdfa 100644 --- a/structs.go +++ b/structs.go @@ -11,7 +11,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" ) @@ -19,7 +18,6 @@ var me *gusconf // this app's variables type gusconf 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