From d8451d71898fb96dd096a9d560f36ad52d460726 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 26 Oct 2025 10:17:14 -0500 Subject: newer better argv --- argv.custom.go | 34 ------------------------ argv.go | 36 +++++++++++++++++++++++++ argv.struct.go | 36 ------------------------- argv.template.go | 81 -------------------------------------------------------- complete.go | 48 +++++++++++++++++++++++++++++++++ main.go | 2 +- structs.go | 2 -- 7 files changed, 85 insertions(+), 154 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 4a8d6f6..0000000 --- a/argv.custom.go +++ /dev/null @@ -1,34 +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 = "regex" - -func (a args) Description() string { - return ` -regex -- interact with Googles' Gemini AI - ` -} - -// 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", "interact", "playback", "clean", "--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..6d94f1f --- /dev/null +++ b/argv.go @@ -0,0 +1,36 @@ +// 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 { + Uuid string `arg:"--uuid" help:"look at this uuid"` + Topic string `arg:"--topic" help:"set the topic"` + JsonFile string `arg:"--json" help:"import a JSON file from gemini-cli"` + Interact *EmptyCmd `arg:"subcommand:interact" help:"open env EDITOR"` + Playback *PlaybackCmd `arg:"subcommand:playback" help:"dump your prior conversations to the terminal'"` + NewChat *PlaybackCmd `arg:"subcommand:newchat" help:"used by gemini-cli on startup"` + Clean *CleanCmd `arg:"subcommand:clean" help:"cleanup the files in /tmp"` + Stats string `arg:"--stats" help:"add stats to a chat"` + 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 { +} + +type CleanCmd struct { + Match string `arg:"positional"` +} + +type PlaybackCmd struct { + Last *EmptyCmd `arg:"subcommand:last" help:"dump the last one"` + List *EmptyCmd `arg:"subcommand:list" help:"list memories"` + Long *EmptyCmd `arg:"subcommand:long" help:"show info on each chat"` + Purge *EmptyCmd `arg:"subcommand:purge" help:"verify chat uuids & purge empty chats"` + Submit *EmptyCmd `arg:"subcommand:submit" help:"convert and submit the last entry"` +} diff --git a/argv.struct.go b/argv.struct.go deleted file mode 100644 index 6d94f1f..0000000 --- a/argv.struct.go +++ /dev/null @@ -1,36 +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 { - Uuid string `arg:"--uuid" help:"look at this uuid"` - Topic string `arg:"--topic" help:"set the topic"` - JsonFile string `arg:"--json" help:"import a JSON file from gemini-cli"` - Interact *EmptyCmd `arg:"subcommand:interact" help:"open env EDITOR"` - Playback *PlaybackCmd `arg:"subcommand:playback" help:"dump your prior conversations to the terminal'"` - NewChat *PlaybackCmd `arg:"subcommand:newchat" help:"used by gemini-cli on startup"` - Clean *CleanCmd `arg:"subcommand:clean" help:"cleanup the files in /tmp"` - Stats string `arg:"--stats" help:"add stats to a chat"` - 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 { -} - -type CleanCmd struct { - Match string `arg:"positional"` -} - -type PlaybackCmd struct { - Last *EmptyCmd `arg:"subcommand:last" help:"dump the last one"` - List *EmptyCmd `arg:"subcommand:list" help:"list memories"` - Long *EmptyCmd `arg:"subcommand:long" help:"show info on each chat"` - Purge *EmptyCmd `arg:"subcommand:purge" help:"verify chat uuids & purge empty chats"` - Submit *EmptyCmd `arg:"subcommand:submit" help:"convert and submit the last entry"` -} 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..69a1d0c --- /dev/null +++ b/complete.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 ( + "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 = "regex" + +func (a args) Description() string { + return ` +regex -- interact with Googles' Gemini AI + ` +} + +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", "interact", "playback", "clean", "--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 91ced42..77ac462 100644 --- a/main.go +++ b/main.go @@ -25,7 +25,7 @@ var configSave bool func main() { me = new(mainType) // me.myGui = prep.Gui() // prepares the GUI package for go-args - me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args + argvpb.Init(&argv, APPNAME, BUILDTIME, VERSION) // adds shell auto-complete var err error // load the default chat protobuf diff --git a/structs.go b/structs.go index 81ea423..669dc21 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/chatpb" "google.golang.org/genai" ) @@ -19,7 +18,6 @@ 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! myGui *fhelp.GuiPrep // the gui handle itself gui *gui.Node // the gui handle itself -- cgit v1.2.3