Compare commits

..

No commits in common. "master" and "v0.0.6" have entirely different histories.

10 changed files with 140 additions and 82 deletions

23
argv.go
View File

@ -3,12 +3,6 @@
package main package main
import (
"os"
"go.wit.com/lib/gui/prep"
)
/* /*
this parses the command line arguements using alex flint's go-arg this parses the command line arguements using alex flint's go-arg
*/ */
@ -54,20 +48,3 @@ func (a args) Description() string {
regex -- interact with Googles' Gemini AI regex -- interact with Googles' Gemini AI
` `
} }
/*
handles shell autocomplete
*/
func (args) Appname() string {
return ARGNAME
}
func (a args) DoAutoComplete(pb *prep.Auto) {
if pb.Cmd == "" {
pb.Autocomplete3([]string{"--bash", "interact", "playback", "clean"})
} else {
pb.SubCommand(pb.Argv...)
}
os.Exit(0)
}

89
argvAutoshell.go Normal file
View File

@ -0,0 +1,89 @@
// 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"
"os"
)
/*
handles shell autocomplete
*/
// used for shell auto completion
// var ARGNAME string = "forge" // todo: get this from $0 ?
func deleteMatch() {
// f := forgedb.InitSimple()
fmt.Println("go.wit.com/lib/gui/repostatus todo: need to do this")
}
func (args) doBashAuto() {
// argv.doBashHelp()
switch argv.BashAuto[0] {
case "playback":
fmt.Println("long --uuid purge last submit")
case "clean":
fmt.Println("")
default:
if argv.BashAuto[0] == ARGNAME {
// list the subcommands here
fmt.Println("--json interact playback clean")
}
}
os.Exit(0)
}
// prints help to STDERR // TODO: move everything below this to go-args
func (args) doBashHelp() {
if argv.BashAuto[1] != "''" {
// if this is not blank, then the user has typed something
return
}
if argv.BashAuto[0] != ARGNAME {
// if this is not the name of the command, the user already started doing something
return
}
if argv.BashAuto[0] == ARGNAME {
me.pp.WriteHelp(os.Stderr)
return
}
fmt.Fprintln(os.Stderr, "")
fmt.Fprintln(os.Stderr, "something went wrong with the GO args package")
fmt.Fprintln(os.Stderr, "")
}
// complete -F forge --bash forge
func (args) doBash() {
fmt.Println("# add this in your bashrc:")
fmt.Println("")
fmt.Println("# todo: add this to go-arg as a 'hidden' go-arg option --bash")
fmt.Println("#")
fmt.Println("# Put the below in the file: ~/.local/share/bash-completion/completions/" + ARGNAME)
fmt.Println("#")
fmt.Println("# todo: make this output work/parse with:")
fmt.Println("# complete -C " + ARGNAME + " --bash go")
fmt.Println("")
fmt.Println("_" + ARGNAME + "_complete()")
fmt.Println("{")
fmt.Println(" # sets local to this func vars")
fmt.Println(" local cur prev all")
fmt.Println(" cur=${COMP_WORDS[COMP_CWORD]}")
fmt.Println(" prev=${COMP_WORDS[COMP_CWORD-1]}")
fmt.Println(" all=${COMP_WORDS[@]}")
fmt.Println("")
fmt.Println(" # this is where we generate the go-arg output")
fmt.Println(" GOARGS=$(" + ARGNAME + " --auto-complete $prev \\'$cur\\' $all)")
fmt.Println("")
fmt.Println(" # this compares the command line input from the user")
fmt.Println(" # to whatever strings we output")
fmt.Println(" COMPREPLY=( $(compgen -W \"$GOARGS\" -- $cur) ) # THIS WORKS")
fmt.Println(" return 0")
fmt.Println("}")
fmt.Println("complete -F _" + ARGNAME + "_complete " + ARGNAME)
fmt.Println("")
fmt.Println("# copy and paste the above into your bash shell should work")
os.Exit(0)
}

4
build
View File

@ -1,4 +0,0 @@
#!/bin/bash -x
mkdir -p files/usr/share/bash-completion/completions/
regex --bash > files/usr/share/bash-completion/completions/regex

View File

@ -1,4 +1,4 @@
Package: regex Package: gemini
Maintainer: Jeff Carr <jcarr@wit.com> Maintainer: Jeff Carr <jcarr@wit.com>
Depends: go-gui-toolkits Depends: go-gui-toolkits
Build-Depends: golang, protoc-gen-go, autogenpb, go-mod-clean Build-Depends: golang, protoc-gen-go, autogenpb, go-mod-clean

View File

@ -27,17 +27,24 @@ func debug() {
} }
func doGui() { func doGui() {
me.myGui = gui.New()
// me.myGui.SetAppDefaultPlugin(me.forge.Config.DefaultGui)
me.myGui.Default()
win := gadgets.NewGenericWindow("regex: a WIT Cloud private AI tool", "Current Conversations") win := gadgets.NewGenericWindow("regex: a WIT Cloud private AI tool", "Current Conversations")
drawWindow(win) drawWindow(win)
win.Custom = func() { win.Custom = func() {
log.Warn("MAIN WINDOW CLOSE") log.Warn("MAIN WINDOW CLOSE")
gui.StandardExit() me.myGui.StandardExit()
os.Exit(0) os.Exit(0)
} }
me.mainWindow = win me.mainWindow = win
// sits here forever
debug()
} }
func drawWindow(win *gadgets.GenericWindow) { func drawWindow(win *gadgets.GenericWindow) {

View File

@ -86,7 +86,7 @@ func listChats(chats *chatpb.Chats) {
// print out one line for each chat entry // print out one line for each chat entry
func listEntries(chat *chatpb.Chat) { func listEntries(chat *chatpb.Chat) {
log.Printf("--- Entries for Topic: %s ---\n", chat.GetChatName()) log.Printf("--- Entries for Topic: %s ---\n", chat.GetChatName())
width, _ := getTerminalWidth() width := getTerminalWidth()
// Determine the maximum length of the author and time string // Determine the maximum length of the author and time string
maxAuthorAndTimeLen := 0 maxAuthorAndTimeLen := 0

29
main.go
View File

@ -7,9 +7,11 @@ package main
import ( import (
"embed" "embed"
"os"
"github.com/google/uuid" "github.com/google/uuid"
"go.wit.com/lib/gui/prep" "go.wit.com/dev/alexflint/arg"
"go.wit.com/gui"
"go.wit.com/lib/protobuf/chatpb" "go.wit.com/lib/protobuf/chatpb"
"go.wit.com/log" "go.wit.com/log"
) )
@ -30,11 +32,20 @@ var ARGNAME string = "regex"
var configSave bool var configSave bool
func main() { func main() {
me = new(mainType)
me.myGui = prep.Gui() // prepares the GUI package for go-args
me.auto = prep.Bash3(&argv) // add support for bash autocomplete with go-arg
var err error var err error
me = new(mainType)
gui.InitArg()
me.pp = arg.MustParse(&argv)
if argv.Bash {
argv.doBash()
os.Exit(0)
}
if len(argv.BashAuto) != 0 {
argv.doBashAuto()
os.Exit(0)
}
// load the default chat protobuf // load the default chat protobuf
me.chats = chatpb.NewChats() me.chats = chatpb.NewChats()
if err := me.chats.ConfigLoad(); err != nil { if err := me.chats.ConfigLoad(); err != nil {
@ -98,9 +109,11 @@ func main() {
okExit("") okExit("")
} }
me.myGui.Start() // loads the GUI toolkit doGui()
doGui() // start making our forge GUI
debug() // sits here forever // by default, start interacting with gemini-cli
// me.pp.WriteHelp(os.Stdout)
okExit("")
} }
func verifyUuids(chats *chatpb.Chats) bool { func verifyUuids(chats *chatpb.Chats) bool {

View File

@ -6,8 +6,9 @@ package main
import ( import (
"context" "context"
"go.wit.com/dev/alexflint/arg"
"go.wit.com/gui"
"go.wit.com/lib/gadgets" "go.wit.com/lib/gadgets"
"go.wit.com/lib/gui/prep"
"go.wit.com/lib/protobuf/chatpb" "go.wit.com/lib/protobuf/chatpb"
"google.golang.org/genai" "google.golang.org/genai"
) )
@ -16,11 +17,11 @@ var me *mainType
// this app's variables // this app's variables
type mainType struct { type mainType struct {
auto *prep.Auto // more experiments for bash handling pp *arg.Parser // for parsing the command line args. Yay to alexf lint!
chats *chatpb.Chats // all our prior conversations with regex chats *chatpb.Chats // all our prior conversations with regex
client *genai.Client // the Google Gemini AI client variable client *genai.Client // the Google Gemini AI client variable
ctx context.Context // global context. what does this acutally mean? ctx context.Context // global context. what does this acutally mean?
lastChat *chatpb.Chat // the last chat. append to here lastChat *chatpb.Chat // the last chat. append to here
myGui *prep.GuiPrep // the gui toolkit handle myGui *gui.Node // the gui toolkit handle
mainWindow *gadgets.GenericWindow // the main GUI window mainWindow *gadgets.GenericWindow // the main GUI window
} }

View File

@ -1,41 +0,0 @@
package main
import (
"log"
"os"
"golang.org/x/term"
)
// getTerminalWidth returns the width of the active terminal.
// If the output is not an interactive terminal (e.g., it's being piped to a file
// or another command), it returns a default width and false.
func getTerminalWidth() (int, bool) {
// term.IsTerminal checks if the given file descriptor is connected to a terminal.
// We use os.Stdout.Fd() to check the standard output.
if term.IsTerminal(int(os.Stdout.Fd())) {
// term.GetSize returns the dimensions of the given terminal.
width, _, err := term.GetSize(int(os.Stdout.Fd()))
if err != nil {
// If we can't get the size for some reason, fall back to the default.
log.Printf("could not get terminal size: %v", err)
return 120, false
}
return width, true
}
// If it's not a terminal, return the default width.
return 120, false
}
// truncateString shortens a string to the specified length, adding an ellipsis if truncated.
func truncateString(s string, maxLength int) string {
if len(s) <= maxLength {
return s
}
// Subtract 3 to make room for the ellipsis "..."
if maxLength < 3 {
return "..."
}
return s[:maxLength-3] + "..."
}

16
terminal_width.go Normal file
View File

@ -0,0 +1,16 @@
package main
import (
"os"
"golang.org/x/term"
)
func getTerminalWidth() int {
width, _, err := term.GetSize(int(os.Stdout.Fd()))
if err != nil {
// Return a default width if there's an error
return 80
}
return width
}