diff options
| -rw-r--r-- | argv.custom.go | 29 | ||||
| -rw-r--r-- | argv.struct.go (renamed from argv.go) | 35 | ||||
| -rw-r--r-- | argv.template.go | 80 | ||||
| -rw-r--r-- | doIncoming.go | 2 | ||||
| -rw-r--r-- | main.go | 37 | ||||
| -rw-r--r-- | makePackagesFile.go | 4 | ||||
| -rw-r--r-- | structs.go | 8 |
7 files changed, 134 insertions, 61 deletions
diff --git a/argv.custom.go b/argv.custom.go new file mode 100644 index 0000000..c1e1431 --- /dev/null +++ b/argv.custom.go @@ -0,0 +1,29 @@ +// 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 = "mirrors" // todo: get this from $0 + +// sends the strings to bash or zsh that will be your options +func (a args) SendCompletionStrings(pb *argvpb.Argv) { + base := []string{"--dry-run", "--force", "incoming", "walk", "list", "everything", "verify", "newest", "--create", "--verbose", "release"} + + if pb.Cmd == "" { + pb.SendStrings(base) + } else { + pb.SubCommand(pb.Goargs...) + } + os.Exit(0) +} @@ -3,17 +3,6 @@ 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" -) - var argv args type args struct { @@ -39,27 +28,3 @@ type WalkCmd struct { type IncomingCmd struct { Force bool `arg:"--force" help:"rebuild everything"` } - -func (args) Buildtime() (string, string) { - return BUILDTIME, VERSION -} - -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) { - base := []string{"--dry-run", "--force", "incoming", "walk", "list", "everything", "verify", "newest", "--create", "--verbose", "release"} - - if pb.Cmd == "" { - pb.SendStrings(base) - } else { - pb.SubCommand(pb.Goargs...) - } - os.Exit(0) -} 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/doIncoming.go b/doIncoming.go index 85b81aa..d6dbed4 100644 --- a/doIncoming.go +++ b/doIncoming.go @@ -60,7 +60,7 @@ func moveOutOfIncoming(fullname string) error { // log.Printf("%s moved incoming oldname %s newname: %s\n", packageName, path, newfilename) } // return "file already exists. use --force to replace", errors.New("duplicate .deb in incoming/") - me.sh.GoodExit("file already exists. TODO: fix this to use --force to replace") + me.argv.GoodExit("file already exists. TODO: fix this to use --force to replace") } // file can be moved os.Rename(fullname, newfilename) @@ -13,19 +13,12 @@ import ( "go.wit.com/log" ) -// sent via -ldflags -var VERSION string -var BUILDTIME string - -// used for shell auto completion -var ARGNAME string = "mirrors" // todo: get this from $0 - //go:embed resources/* var resources embed.FS func main() { me = new(mainType) - me.sh = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args + me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args // read in protobuf file me.pb = zoopb.NewPackages() @@ -33,7 +26,7 @@ func main() { if err := me.pb.Load(); err != nil { me.pb.BaseDir = config.GetPanic("BaseDir") me.pb.Save() - me.sh.GoodExit("created new pb file: " + me.pb.Filename + ". rerun mirrors.") + me.argv.GoodExit("created new pb file: " + me.pb.Filename + ". rerun mirrors.") } // force check the PB variable @@ -41,32 +34,32 @@ func main() { if me.pb.BaseDir != config.GetPanic("BaseDir") { me.pb.BaseDir = config.GetPanic("BaseDir") me.pb.Save() - me.sh.BadExit("pb.BaseDir is bank", nil) + me.argv.BadExit("pb.BaseDir is bank", nil) } if err := os.Chdir(me.pb.BaseDir); err != nil { - me.sh.BadExit("no '"+me.pb.BaseDir+"' directory", err) + me.argv.BadExit("no '"+me.pb.BaseDir+"' directory", err) } if !shell.IsDir("pool/") { - me.sh.BadExit("no "+filepath.Join(me.pb.BaseDir, "pool")+" directory", errors.New("mount -a ? missing wit/pool/")) + me.argv.BadExit("no "+filepath.Join(me.pb.BaseDir, "pool")+" directory", errors.New("mount -a ? missing wit/pool/")) } - if me.sh.Cmd == "" { + if me.argv.Cmd == "" { // STANDARD START // walk for new .deb files s, err := doWalk() if err != nil { - me.sh.BadExit(s, err) + me.argv.BadExit(s, err) } // move files from inccoming into pooo/ s, err = doIncoming(me.pb) if err != nil { - me.sh.BadExit(s, err) + me.argv.BadExit(s, err) } - me.sh.GoodExit(s) + me.argv.GoodExit(s) // STANDARD START END } @@ -106,19 +99,19 @@ func main() { // move files to the right place s, err = doIncoming(me.pb) if err != nil { - me.sh.BadExit(s, err) + me.argv.BadExit(s, err) } // add the filenames to the .pb s, err = doWalk() if err != nil { - me.sh.BadExit(s, err) + me.argv.BadExit(s, err) } // verify all the packages s, err = doVerify() if err != nil { - me.sh.BadExit(s, err) + me.argv.BadExit(s, err) } // print a table of the newest packages @@ -128,7 +121,7 @@ func main() { err = doPurge() if err != nil { - me.sh.BadExit("could not purge dists/", err) + me.argv.BadExit("could not purge dists/", err) } // make and GPG sign the Release files @@ -160,7 +153,7 @@ func main() { */ if err != nil { - me.sh.BadExit(s, err) + me.argv.BadExit(s, err) } - me.sh.GoodExit(s) + me.argv.GoodExit(s) } diff --git a/makePackagesFile.go b/makePackagesFile.go index 650a12c..c30acde 100644 --- a/makePackagesFile.go +++ b/makePackagesFile.go @@ -39,11 +39,11 @@ func makePackagesFile(arch string) (string, error) { } if err := os.Chdir(me.pb.BaseDir); err != nil { - me.sh.BadExit("no '"+me.pb.BaseDir+"' directory", err) + me.argv.BadExit("no '"+me.pb.BaseDir+"' directory", err) } if !shell.IsDir("pool/") { - me.sh.BadExit("no "+filepath.Join(me.pb.BaseDir, "pool")+" directory", errors.New("mount -a ? missing wit/pool/")) + me.argv.BadExit("no "+filepath.Join(me.pb.BaseDir, "pool")+" directory", errors.New("mount -a ? missing wit/pool/")) } log.Info("Processing dir", filepath.Join(me.pb.BaseDir, "pool")) @@ -3,8 +3,11 @@ package main import ( "sync" + "go.wit.com/dev/alexflint/arg" "go.wit.com/lib/config" + "go.wit.com/lib/fhelp" "go.wit.com/lib/protobuf/argvpb" + "go.wit.com/lib/protobuf/forgepb" "go.wit.com/lib/protobuf/zoopb" ) @@ -13,7 +16,10 @@ var me *mainType // this app's variables type mainType struct { once sync.Once // one-time initialized data - sh *argvpb.Argv // shell autocomplete + 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 pb *zoopb.Packages // the mirrors packages config *config.Config // the mirrors packages } |