From 0423bb1a76d9c68abcba1265f938288180a8f018 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 26 Oct 2025 10:30:28 -0500 Subject: jesus. finally fixing this --- argv.custom.go | 37 -------------------------- argv.go | 21 +++++++++++++++ argv.struct.go | 21 --------------- argv.template.go | 81 -------------------------------------------------------- complete.go | 51 +++++++++++++++++++++++++++++++++++ main.go | 2 +- structs.go | 2 -- 7 files changed, 73 insertions(+), 142 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 bec8e24..0000000 --- a/argv.custom.go +++ /dev/null @@ -1,37 +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" -) - -// sent via -ldflags -var VERSION string -var BUILDTIME string - -// used for shell auto completion -var APPNAME string = "startxplacement" - -func (a args) Description() string { - return ` -startxplacment -- run this after 'startx' to restore all your apps - -will attempt to launch your terminal windows on the right Workspaces -and with the right geometries. TODO: restore the bash working paths - ` -} - -// sends the strings to bash or zsh that will be your options -func (a args) SendCompletionStrings(pb *argvpb.Argv) { - if pb.GetCmd() == "" { - base := []string{"--restore", "save", "dump", "dumpx", "list", "--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..9650b81 --- /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 { + Restore string `arg:"--restore" help:"restore terminal windows from a config file"` + Save *EmptyCmd `arg:"subcommand:save" help:"save current window geometries to the your config file"` + DumpX *EmptyCmd `arg:"subcommand:dumpx" help:"show your current window geometries"` + Dump *EmptyCmd `arg:"subcommand:dump" help:"show your current window geometries"` + List *EmptyCmd `arg:"subcommand:list" help:"list entries in your config file"` + Force bool `arg:"--force" help:"try to strong arm things"` + Verbose bool `arg:"--verbose" help:"show more output"` + 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 9650b81..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 { - Restore string `arg:"--restore" help:"restore terminal windows from a config file"` - Save *EmptyCmd `arg:"subcommand:save" help:"save current window geometries to the your config file"` - DumpX *EmptyCmd `arg:"subcommand:dumpx" help:"show your current window geometries"` - Dump *EmptyCmd `arg:"subcommand:dump" help:"show your current window geometries"` - List *EmptyCmd `arg:"subcommand:list" help:"list entries in your config file"` - Force bool `arg:"--force" help:"try to strong arm things"` - Verbose bool `arg:"--verbose" help:"show more output"` - 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..3289419 --- /dev/null +++ b/complete.go @@ -0,0 +1,51 @@ +// 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" +) + +// sent via -ldflags +var VERSION string +var BUILDTIME string + +// used for shell auto completion +var APPNAME string = "startxplacement" + +func (a args) Description() string { + return ` +startxplacment -- run this after 'startx' to restore all your apps + +will attempt to launch your terminal windows on the right Workspaces +and with the right geometries. TODO: restore the bash working paths + ` +} + +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{"--restore", "save", "dump", "dumpx", "list", "--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 953fb1b..c200101 100644 --- a/main.go +++ b/main.go @@ -19,7 +19,7 @@ var configFile string = "/home/jcarr/.config/startxplacement.out" 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.DumpX != nil { doDumpX() diff --git a/structs.go b/structs.go index 8034c3b..788b12d 100644 --- a/structs.go +++ b/structs.go @@ -7,14 +7,12 @@ import ( "go.wit.com/dev/alexflint/arg" "go.wit.com/gui" "go.wit.com/lib/fhelp" - "go.wit.com/lib/protobuf/argvpb" ) var me *mainType // this app's variables type mainType struct { - argv *argvpb.Argv // shell autocomplete pp *arg.Parser // for parsing the command line args. Yay to alexf lint! gui *gui.Node // the gui toolkit handle myGui *fhelp.GuiPrep // the gui toolkit handle -- cgit v1.2.3