From 5e7f902d5fae4014b8eef8c4945cbc131c6f701e Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 19 Oct 2025 05:15:33 -0500 Subject: newer but still not right argv --- argv.custom.go | 34 ++++++++++++++++++++++++ argv.go | 79 ------------------------------------------------------- argv.struct.go | 36 +++++++++++++++++++++++++ argv.template.go | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ main.go | 7 ----- structs.go | 7 ++++- 6 files changed, 156 insertions(+), 87 deletions(-) create mode 100644 argv.custom.go delete mode 100644 argv.go create mode 100644 argv.struct.go create mode 100644 argv.template.go diff --git a/argv.custom.go b/argv.custom.go new file mode 100644 index 0000000..a288d66 --- /dev/null +++ b/argv.custom.go @@ -0,0 +1,34 @@ +// 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.Cmd == "" { + 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 deleted file mode 100644 index c8fdbaf..0000000 --- a/argv.go +++ /dev/null @@ -1,79 +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" -) - -/* - this parses the command line arguements using alex flint's go-arg -*/ - -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"` -} - -func (a args) Description() string { - return ` -regex -- interact with Googles' Gemini AI - ` -} - -/* - handles shell autocomplete -*/ - -func (args) Appname() string { - return ARGNAME -} - -func (args) Buildtime() (string, string) { - return BUILDTIME, VERSION -} - -func (args) Version() string { - return argvpb.StandardVersion(ARGNAME, VERSION, BUILDTIME) -} - -// sends the strings to bash or zsh that will be your options -func (a args) SendCompletionStrings(pb *argvpb.Argv) { - if pb.Cmd == "" { - base := []string{"--bash", "interact", "playback", "clean", "--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..6d94f1f --- /dev/null +++ b/argv.struct.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.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 +} diff --git a/main.go b/main.go index 20f0d4a..91ced42 100644 --- a/main.go +++ b/main.go @@ -14,18 +14,11 @@ import ( "go.wit.com/log" ) -// sent via -ldflags -var VERSION string -var BUILDTIME string - // this optionally can store the GUI plugins // //go:embed resources/* var resources embed.FS -// used for shell auto completion -var ARGNAME string = "regex" - // using this for now. triggers config save var configSave bool diff --git a/structs.go b/structs.go index da20513..81ea423 100644 --- a/structs.go +++ b/structs.go @@ -6,6 +6,9 @@ package main import ( "context" + "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/chatpb" @@ -17,10 +20,12 @@ 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 chats *chatpb.Chats // all our prior conversations with regex client *genai.Client // the Google Gemini AI client variable ctx context.Context // global context. what does this acutally mean? lastChat *chatpb.Chat // the last chat. append to here - myGui *argvpb.GuiPrep // the gui toolkit handle mainWindow *gadgets.GenericWindow // the main GUI window } -- cgit v1.2.3