From a5ada1d59a8b56a033949a48af15bc74330cab07 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 19 Oct 2025 05:59:05 -0500 Subject: new argv --- Makefile | 11 +++++--- argv.custom.go | 49 ++++++++++++++++++++++++++++++++++ argv.go | 76 ----------------------------------------------------- argv.struct.go | 19 ++++++++++++++ argv.template.go | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ main.go | 6 ----- structs.go | 9 +++++-- 7 files changed, 163 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/Makefile b/Makefile index 11377ae..6a6d340 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,8 @@ +.PHONY: build + +VERSION = $(shell git describe --tags) +BUILDTIME = $(shell date +%s) + all: portmap.pb.go goimports vet @echo This GO code passes the compile checks @@ -17,15 +22,15 @@ gocui: build build: goimports vet GO111MODULE=off go build -v -x \ - -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" + -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME}" install: goimports vet GO111MODULE=off go install \ - -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" + -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME}" install-verbose: goimports vet GO111MODULE=off go install -v -x \ - -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" + -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME}" goimports: goimports -w *.go diff --git a/argv.custom.go b/argv.custom.go new file mode 100644 index 0000000..831da65 --- /dev/null +++ b/argv.custom.go @@ -0,0 +1,49 @@ +// 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" + "go.wit.com/log" +) + +var VERSION string +var BUILDTIME string + +var APPNAME string = "gus" + +func (a args) Description() string { + return ` + "Phantastic Gus" your network squirrel + + * Meet [the Phantastic squirrel Gus](https://www.youtube.com/watch?v=hFZFjoX2cGg) +` +} + +var NOW *log.LogFlag +var INFO *log.LogFlag +var PING *log.LogFlag +var WARN *log.LogFlag + +func init() { + full := "go.wit.com/lib/daemon/gus" + short := "zood" + + NOW = log.NewFlag("NOW", true, full, short, "useful while doing debugging") + INFO = log.NewFlag("INFO", false, full, short, "general gus") + WARN = log.NewFlag("WARN", true, full, short, "bad things") +} + +// 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", "--me", "gui", "--daemon"} + pb.SendStrings(base) + } else { + pb.SubCommand(pb.Goargs...) + } + os.Exit(0) +} diff --git a/argv.go b/argv.go deleted file mode 100644 index b9e1356..0000000 --- a/argv.go +++ /dev/null @@ -1,76 +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 - -/* - this parses the command line arguements - this enables command line options from other packages like 'gui' and 'log' -*/ - -import ( - "os" - - "go.wit.com/lib/protobuf/argvpb" - "go.wit.com/log" -) - -var argv args - -type args struct { - Gui *EmptyCmd `arg:"subcommand:gui" help:"open the gui"` - Verbose bool `arg:"--verbose" help:"talk more"` - Daemon bool `arg:"--daemon" default:"false" help:"run in daemon mode"` - UseME bool `arg:"--me" help:"use /me to connect"` - Port int `arg:"--port" default:"2522" help:"port to run on"` - URL string `arg:"--url" help:"url to use"` - Config string `arg:"--config" help:"config file (default is ~/.config/cloud/gus.text"` -} - -type EmptyCmd struct { -} - -func (a args) Description() string { - return ` - "Phantastic Gus" your network squirrel - - * Meet [the Phantastic squirrel Gus](https://www.youtube.com/watch?v=hFZFjoX2cGg) -` -} - -var NOW *log.LogFlag -var INFO *log.LogFlag -var PING *log.LogFlag -var WARN *log.LogFlag - -func init() { - full := "go.wit.com/lib/daemon/gus" - short := "zood" - - NOW = log.NewFlag("NOW", true, full, short, "useful while doing debugging") - INFO = log.NewFlag("INFO", false, full, short, "general gus") - WARN = log.NewFlag("WARN", true, full, short, "bad things") -} - -/* - handles shell autocomplete -*/ - -func (args) Version() string { - return argvpb.StandardVersion(ARGNAME, VERSION, BUILDTIME) -} - -func (args) Appname() string { - return ARGNAME -} - -// 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", "--me", "gui", "--daemon"} - 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..3d0b0c2 --- /dev/null +++ b/argv.struct.go @@ -0,0 +1,19 @@ +// 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 { + Gui *EmptyCmd `arg:"subcommand:gui" help:"open the gui"` + Verbose bool `arg:"--verbose" help:"talk more"` + Daemon bool `arg:"--daemon" default:"false" help:"run in daemon mode"` + UseME bool `arg:"--me" help:"use /me to connect"` + Port int `arg:"--port" default:"2522" help:"port to run on"` + URL string `arg:"--url" help:"url to use"` + Config string `arg:"--config" help:"config file (default is ~/.config/cloud/gus.text"` +} + +type EmptyCmd struct { +} 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 d158e8b..28f0428 100644 --- a/main.go +++ b/main.go @@ -21,17 +21,11 @@ import ( timestamppb "google.golang.org/protobuf/types/known/timestamppb" ) -var VERSION string -var BUILDTIME string - -var ARGNAME string = "gus" - //go:embed resources/* var resources embed.FS func main() { me = new(gusconf) - me.myGui = argvpb.Gui() // prepares the GUI package for go-args me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args log.Info("tmp hack", uuid.New().String()) diff --git a/structs.go b/structs.go index 8aab53a..8c54a0b 100644 --- a/structs.go +++ b/structs.go @@ -7,17 +7,22 @@ import ( sync "sync" "time" + "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/forgepb" ) var me *gusconf // this app's variables type gusconf struct { - argv *argvpb.Argv // shell autocomplete - myGui *argvpb.GuiPrep // the base of the gui + argv *argvpb.Argv // more experiments for bash handling + pp *arg.Parser // for parsing the command line args. Yay to alexf lint! + myGui *fhelp.GuiPrep // for initializing the GUI toolkits + forge *forgepb.Forge // your customized repo preferences and settings portmaps *Portmaps // the portmap window portwin *stdTableWin // the portwin window events *Events // the event log -- cgit v1.2.3