From 6c6af8707a8fe97de3978feeb6a1e05dbc94e37d Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 8 Sep 2025 14:57:46 -0500 Subject: [PATCH] finally back to one file again --- argv.go | 93 +++++++++++++++++++++++++++++++++++++ argvAutoshell.go | 117 ----------------------------------------------- main.go | 3 +- 3 files changed, 95 insertions(+), 118 deletions(-) delete mode 100644 argvAutoshell.go diff --git a/argv.go b/argv.go index 63c66c6..db33e90 100644 --- a/argv.go +++ b/argv.go @@ -164,3 +164,96 @@ func (args) doBashHelpDebug() { fmt.Fprintln(os.Stderr, "pull something else", argv.BashAuto, len(argv.BashAuto), p0, p1, p2, p1a, "end", more) fmt.Fprintln(os.Stderr, "") } + +/* + 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 ifBlank() bool { + if argv.BashAuto[1] == "''" { + // if empty, the user has not typed something + return true + } + return false +} + +// 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, "hello world") + fmt.Fprintln(os.Stderr, "") +} + +func (args) doBashAuto() { + // argv.doBashHelp() + switch argv.BashAuto[0] { + case "checkout": + fmt.Println("devel master user") + case "clean": + // me.pp.WriteHelp(os.Stderr) + // me.pp.WriteUsageForSubcommand(os.Stderr, me.pp.SubcommandNames()...) + // me.pp.WriteHelpForSubcommand(os.Stderr, me.pp.SubcommandNames()...) + // me.pp.WriteHelpForSubcommand(os.Stderr, "clean") + fmt.Println("--force") + case "commit": + fmt.Println("--all") + case "config": + fmt.Println("add fix list debug") + case "delete": + deleteMatch() + case "dirty": + fmt.Println("") + case "gui": + if ifBlank() { + fmt.Fprintln(os.Stderr, "") + fmt.Fprintln(os.Stderr, "CUI: terminal interface using 'gocui'") + fmt.Fprintln(os.Stderr, "GUI: linux and macos GUI using GTK") + } else { + fmt.Println("CUI GUI") + } + case "list": + fmt.Println("--full") + case "merge": + fmt.Println("devel master") + case "normal": + fmt.Println("on off") + case "pull": + fmt.Println("-force check") + case "patch": + fmt.Println("check get list repos submit show") + case "user": + fmt.Println("--force") + case "devel": + fmt.Println("--force") + case "master": + fmt.Println("") + case "verify": + fmt.Println("user devel master") + default: + if argv.BashAuto[0] == ARGNAME { + // list the subcommands here + fmt.Println("help list checkout clean commit dirty debug fetch gui normal merge patch pull") + } + } + os.Exit(0) +} diff --git a/argvAutoshell.go b/argvAutoshell.go deleted file mode 100644 index b01b691..0000000 --- a/argvAutoshell.go +++ /dev/null @@ -1,117 +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 ( - "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 "checkout": - fmt.Println("devel master user") - case "clean": - // me.pp.WriteHelp(os.Stderr) - // me.pp.WriteUsageForSubcommand(os.Stderr, me.pp.SubcommandNames()...) - // me.pp.WriteHelpForSubcommand(os.Stderr, me.pp.SubcommandNames()...) - // me.pp.WriteHelpForSubcommand(os.Stderr, "clean") - fmt.Println("--force") - case "commit": - fmt.Println("--all") - case "config": - fmt.Println("add fix list debug") - case "delete": - deleteMatch() - case "dirty": - fmt.Println("") - case "list": - fmt.Println("--full") - case "merge": - fmt.Println("devel master") - case "normal": - fmt.Println("on off") - case "pull": - fmt.Println("-force check") - case "patch": - fmt.Println("check get list repos submit show") - case "user": - fmt.Println("--force") - case "devel": - fmt.Println("--force") - case "master": - fmt.Println("") - case "verify": - fmt.Println("user devel master") - default: - if argv.BashAuto[0] == ARGNAME { - // list the subcommands here - fmt.Println("help list checkout clean commit dirty debug fetch normal merge patch pull") - } - } - 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, "hello world") - 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("# todo: can this output work/parse with:") - fmt.Println("# complete -C `" + ARGNAME + " --bash` " + ARGNAME) - 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) -} diff --git a/main.go b/main.go index cd4185b..6937372 100644 --- a/main.go +++ b/main.go @@ -14,6 +14,7 @@ import ( "go.wit.com/dev/alexflint/arg" "go.wit.com/gui" + "go.wit.com/lib/fhelp" "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/forgepb" "go.wit.com/lib/protobuf/gitpb" @@ -50,7 +51,7 @@ func main() { me.pp = arg.MustParse(&argv) if argv.Bash { - argv.doBash() + fhelp.DoBash(ARGNAME) os.Exit(0) } if len(argv.BashAuto) != 0 {