argv.go

@@ -9,9 +9,9 @@ package main
 */
 
 import (
-	"fmt"
-	"os"
-	"strings"
+	"go.wit.com/lib/debugger"
+	"go.wit.com/lib/gui/logsettings"
+	"go.wit.com/log"
 )
 
 var argv args
@@ -32,34 +32,32 @@ type args struct {
 	Recursive   bool      `arg:"--recursive"                   help:"go-clone --recursive"`
 	Test        bool      `arg:"--test"                        help:"test build after everything else"`
 	WITCOM      bool      `arg:"--witcom"                      help:"add the GPL header"`
+	Bash        bool      `arg:"--bash"                        help:"generate bash completion"`
+	BashAuto    []string  `arg:"--auto-complete"               help:"does the actual autocompletion"`
 }
 
 type EmptyCmd struct {
 }
 
+func init() {
+	if debugger.ArgDebug() {
+		log.Info("cmd line --debugger == true")
+		go func() {
+			log.Sleep(2)
+			debugger.DebugWindow()
+		}()
+	}
+
+	if debugger.ArgLogger() {
+		log.Info("cmd line --loggger == true")
+		go func() {
+			log.Sleep(4)
+			logsettings.LogWindow()
+			logsettings.LogWindow()
+		}()
+	}
+}
+
 func (args) Version() string {
 	return ARGNAME + " " + VERSION + "    Built on " + BUILDTIME
 }
-
-func (a args) DoAutoComplete(argv []string) {
-	switch argv[0] {
-	case "list":
-		fmt.Println("--all --mine --favorites --private")
-	case "debian":
-		fmt.Println("--dry-run")
-	case "upgrade":
-		fmt.Println("--dry-run")
-	case "build":
-		fmt.Println("--verbose")
-	case "install":
-		fmt.Println("--verbose")
-	case "repomap-clone":
-		fmt.Println("--repomap")
-	default:
-		if strings.HasSuffix(argv[0], ARGNAME) {
-			// list the subcommands here
-			fmt.Println("--bash list build debian install repomap-clone upgrade")
-		}
-	}
-	os.Exit(0)
-}

argvAutocomplete.go

@@ -0,0 +1,93 @@
+// 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"
+	"strings"
+)
+
+/*
+	handles shell autocomplete
+*/
+
+func (args) doBashAuto() {
+	argv.doBashHelp()
+	switch argv.BashAuto[0] {
+	case "list":
+		fmt.Println("--all --mine --favorites --private")
+	case "debian":
+		fmt.Println("--dry-run")
+	case "upgrade":
+		fmt.Println("--dry-run")
+	case "build":
+		fmt.Println("--verbose")
+	case "install":
+		fmt.Println("--verbose")
+	case "repomap-clone":
+		fmt.Println("--repomap")
+	default:
+		if strings.HasSuffix(argv.BashAuto[0], ARGNAME) {
+			// list the subcommands here
+			fmt.Println("--bash list build debian install repomap-clone upgrade")
+		}
+	}
+	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.argpp.WriteHelp(os.Stderr)
+		// return
+	}
+	fmt.Fprintln(os.Stderr, "")
+	fmt.Fprintln(os.Stderr, "list:           show every package on mirrors.wit.com")
+	fmt.Fprintln(os.Stderr, "build:          go build every package that identifies as a binary")
+	fmt.Fprintln(os.Stderr, "install:        go install every package into ~/go/bin")
+	fmt.Fprintln(os.Stderr, "repomap-clone:  go-clone every package from a gowebd repomap")
+	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)
+}

control

@@ -1,7 +1,7 @@
-Source: fixup
+Source: fixme
 Build-Depends: golang, protoc-gen-go, autogenpb, go-mod-clean
-Package: fixup
+Package: fixme
 Maintainer: Jeff Carr <jcarr@wit.com>
 Depends: go-gui-toolkits
 Description: make RiscV bootable usb and sdcards
- use this to fix up your not booting riscv board
+ Does other things too. Uses protobufs for disk formats.

doGui.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 	"time"
 
+	"go.wit.com/gui"
 	"go.wit.com/lib/gadgets"
 	"go.wit.com/lib/gui/shell"
 	"go.wit.com/lib/protobuf/virtpb"
@@ -99,6 +100,10 @@ func switchDrive(blk *Block) {
 }
 
 func doGui() {
+	me.myGui = gui.New()
+	me.myGui.InitEmbed(resources)
+	me.myGui.Default()
+
 	mainWindow := gadgets.NewGenericWindow("RiscV Imager", "Show Drives")
 	mainWindow.Custom = func() {
 		log.Warn("Main window close")
@@ -106,6 +111,9 @@ func doGui() {
 	}
 
 	drawWindow(mainWindow)
+
+	// sits here forever
+	debug()
 }
 
 func drawWindow(win *gadgets.GenericWindow) {

main.go

@@ -13,7 +13,7 @@ import (
 	"unicode"
 
 	"go.wit.com/dev/alexflint/arg"
-	"go.wit.com/lib/gui/prep"
+	"go.wit.com/gui"
 	"go.wit.com/log"
 )
 
@@ -29,10 +29,26 @@ var resources embed.FS
 
 func main() {
 	me = new(autoType)
-	prep.Bash(ARGNAME, argv.DoAutoComplete) // todo: this line should be:  prep.Bash(argv)
-	me.myGui = prep.Gui()                   // prepares the GUI package for go-args
+	gui.InitArg()
 	me.pp = arg.MustParse(&argv)
 
+	// check if the binary is being called to test
+	// if the plugin can actually loaded. This is a hack
+	// around needing a Test() plugin load function in GO
+	if gui.IsGoPluginTestHack() {
+		gui.CheckPlugin()
+		os.Exit(0)
+	}
+
+	if argv.Bash {
+		argv.doBash()
+		os.Exit(0)
+	}
+	if len(argv.BashAuto) != 0 {
+		argv.doBashAuto()
+		os.Exit(0)
+	}
+
 	me.pb = NewBlocks()
 
 	/*
@@ -43,10 +59,7 @@ func main() {
 	*/
 
 	go listenForBlockEvents()
-
-	me.myGui.Start() // loads the GUI toolkit
-	doGui()          // start making our forge GUI
-	debug()          // sits here forever
+	doGui()
 	okExit("everything compiled")
 }
 

structs.go

@@ -6,18 +6,17 @@ package main
 import (
 	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/gui"
-	"go.wit.com/lib/gui/prep"
 )
 
 var me *autoType
 
 // this app's variables
 type autoType struct {
-	pp           *arg.Parser   // go-arg preprocessor
-	myGui        *prep.GuiPrep // the gui toolkit handle
-	dd           *gui.Node     // the drives dropdown list
-	parted       *gui.Node     // the current drive to run parted on
-	currentDev   *Block        // the current dev entry to work on
-	pb           *Blocks       // the block dev protobuf
-	driveInfoBox *gui.Node     // displays the drive info
+	pp           *arg.Parser // go-arg preprocessor
+	myGui        *gui.Node   // the gui toolkit handle
+	dd           *gui.Node   // the drives dropdown list
+	parted       *gui.Node   // the current drive to run parted on
+	currentDev   *Block      // the current dev entry to work on
+	pb           *Blocks     // the block dev protobuf
+	driveInfoBox *gui.Node   // displays the drive info
 }