From bca3f42ae8ddf7e56c93a143b915a8dc9f3326f4 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Tue, 28 Oct 2025 23:42:23 -0500 Subject: rename now that things are getting cleaner --- argv.Match.go | 51 --------------------- argv.Print.go | 134 -------------------------------------------------------- argv.Version.go | 44 ------------------- argv.match.go | 51 +++++++++++++++++++++ argv.print.go | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ argv.version.go | 44 +++++++++++++++++++ 6 files changed, 229 insertions(+), 229 deletions(-) delete mode 100644 argv.Match.go delete mode 100644 argv.Print.go delete mode 100644 argv.Version.go create mode 100644 argv.match.go create mode 100644 argv.print.go create mode 100644 argv.version.go diff --git a/argv.Match.go b/argv.Match.go deleted file mode 100644 index 2039499..0000000 --- a/argv.Match.go +++ /dev/null @@ -1,51 +0,0 @@ -package argvpb - -import "strings" - -func (pb *Argv) IsMatch(match string) bool { - parts := strings.Split(match, ".") - pb.debugf("IsMatch() parts (%v)", parts) - for _, part := range parts { - var found bool - for _, v := range pb.Real { - if part == v { - found = true - } - } - if found { - continue - } - return false - } - return true -} - -func Len() int { - counter := 0 - for _, s := range PB.Real { - s = strings.TrimSpace(s) - if s == "" { - continue - } - if strings.HasPrefix(s, "--") { - continue - } - counter += 1 - } - return counter -} - -func Real() []string { - var clean []string - for _, s := range PB.Real { - s = strings.TrimSpace(s) - if s == "" { - continue - } - if strings.HasPrefix(s, "--argv") { - continue - } - clean = append(clean, s) - } - return clean -} diff --git a/argv.Print.go b/argv.Print.go deleted file mode 100644 index 49b1089..0000000 --- a/argv.Print.go +++ /dev/null @@ -1,134 +0,0 @@ -package argvpb - -// debug argv protobuf functions -// enable with --autodebug or Setenv( "AUTOCOMPLETE_VERBOSE" ) - -import ( - "fmt" - "os" - "strings" - - "go.wit.com/lib/cobol" - "go.wit.com/lib/config" -) - -func (pb *Argv) debugf(fmts string, parts ...any) { - debugf(fmts, parts...) -} - -// decides here to print to STDERR or not -func debugf(fmts string, parts ...any) { - fmts = strings.TrimSpace(fmts) - fmts += "\n" - // me.pb.Stderr += fmt.Sprintf(fmts, parts...) - fmt.Fprintf(Stddbg, fmts, parts...) -} - -// print out auto complete debugging info -func (pb *Argv) printDebug(last string) { - pb.printDebugNew("ARGV", me.last) -} - -func (pb *Argv) printDebugNew(msg string, last *Argv) { - // var arglast string - // arglast = fmt.Sprintf("last='%s'", last.GetCmd()) - partial := fmt.Sprintf("p='%s'", pb.Partial) - age := cobol.Duration(pb.Ctime) - pdur := cobol.Duration(pb.Duration) - argvdur := cobol.Duration(pb.ArgvDuration) - - var dbg string - if me.debug { - dbg = "dbg=1" - } else { - dbg = "dbg=0" - } - lens := fmt.Sprintf("len=%-2d,%-2d,%-2d", me.all.Len(), len(strings.Fields(pb.Stdout)), len(strings.Split(pb.Stderr, "\n"))) - fast := fmt.Sprintf("F%-2dout%-2derr%-2d %s", pb.Fast, pb.OutCounter, pb.ErrCounter, lens) - top := fmt.Sprintf("%-4.4s age=(%s)(%s)dur(%s) %s %s cmd=%-12.12s", pb.Uuid, age, pdur, argvdur, dbg, fast, pb.GetCmd()) - debugf("%s: %s %-12.12s real='%v'", msg, top, partial, pb.Real) -} - -func (all *Argvs) printHistory(msg string) { - counter := 0 - var last *Argv - // for pb := range all.Argv[0:10] { - for pb := range all.IterAll() { - counter += 1 - pb.printDebugNew(msg, last) - last = pb - if counter > 30 { - // sometimes I'm dumb - break - } - } -} - -func printStddbg() { - if !me.debug { - return - } - if config.Exists("/tmp/argv.debug") { - printStddbgFile() - return - } - lines := strings.Split(strings.TrimSpace(PB.Stddbg), "\n") - if len(lines) == 0 { - return - } - fmt.Fprintf(os.Stderr, "\n") - for _, line := range lines { - fmt.Fprintf(os.Stderr, "%s\n", line) - } - fmt.Fprintf(os.Stderr, "\n") -} - -func printStddbgFile() { - if !me.debug { - return - } - f, err := os.OpenFile("/tmp/argv.debug", os.O_APPEND|os.O_RDWR|os.O_CREATE, 0644) - if err != nil { - return - } - defer f.Close() - lines := strings.Split(strings.TrimSpace(PB.Stddbg), "\n") - if len(lines) == 0 { - return - } - fmt.Fprintf(f, "\n") - for _, line := range lines { - fmt.Fprintf(f, "%s\n", line) - } - fmt.Fprintf(f, "\n") -} - -func printStderr() { - var lines []string - for _, line := range strings.Split(strings.TrimSpace(PB.Stderr), "\n") { - if strings.TrimSpace(line) == "" { - continue - } - lines = append(lines, line) - } - if len(lines) == 0 { - return - } - fmt.Fprintf(os.Stderr, "\n") - for _, line := range lines { - // line = strings.TrimSpace(line) - // if line == "" { - // continue - // } - fmt.Fprintf(os.Stderr, "%s\n", line) - } - fmt.Fprintf(os.Stderr, "\n") -} - -func printStdout() { - line := strings.TrimSpace(PB.Stdout) - if line == "" { - return - } - fmt.Fprintf(os.Stdout, " %s\n", line) -} diff --git a/argv.Version.go b/argv.Version.go deleted file mode 100644 index 7882474..0000000 --- a/argv.Version.go +++ /dev/null @@ -1,44 +0,0 @@ -package argvpb - -import ( - "fmt" - "os" - - "go.wit.com/lib/cobol" -) - -func Version() string { - if PB == nil || PB.AppInfo == nil { - return fmt.Sprintf("argv was not initialized by your application %v", os.Args) - } - return PB.AppInfo.getVersion() -} - -func (pb *Argv) Version() string { - return pb.AppInfo.getVersion() -} - -func doVersion(pb *Argv) { - fmt.Println(pb.AppInfo.getVersion()) - os.Exit(0) -} - -func (info *App) getVersion() string { - var s string - timeString, t, err := cobol.TimeCheck(info.BUILDTIME) - if t != nil { - // fmt.Printf("TIME getVersion(t != nil) ERR=(%v) t=(%v) AppInfo.BUILTIME is=(%v)\n", err, t, info.BUILDTIME) - return fmt.Sprintf("%s %s Built on %s", info.APPNAME, info.VERSION, cobol.Time(t)) - } else if err == nil { - s = fmt.Sprintf("%s %s Built on %s (argv.had(%s))", info.APPNAME, info.VERSION, timeString, info.BUILDTIME) - } else { - // fmt.Printf("TIME getVersion() ERR=(%v) timeString=(%v) AppInfo.BUILTIME was=(%v)\n", err, timeString, info.BUILDTIME) - s = fmt.Sprintf("%s %s Built on raw(%v) (argv had %s)", info.APPNAME, info.VERSION, timeString, info.BUILDTIME) - } - return s -} - -// deprecate ? -func GetAPPNAME() string { - return me.pb.AppInfo.APPNAME -} diff --git a/argv.match.go b/argv.match.go new file mode 100644 index 0000000..2039499 --- /dev/null +++ b/argv.match.go @@ -0,0 +1,51 @@ +package argvpb + +import "strings" + +func (pb *Argv) IsMatch(match string) bool { + parts := strings.Split(match, ".") + pb.debugf("IsMatch() parts (%v)", parts) + for _, part := range parts { + var found bool + for _, v := range pb.Real { + if part == v { + found = true + } + } + if found { + continue + } + return false + } + return true +} + +func Len() int { + counter := 0 + for _, s := range PB.Real { + s = strings.TrimSpace(s) + if s == "" { + continue + } + if strings.HasPrefix(s, "--") { + continue + } + counter += 1 + } + return counter +} + +func Real() []string { + var clean []string + for _, s := range PB.Real { + s = strings.TrimSpace(s) + if s == "" { + continue + } + if strings.HasPrefix(s, "--argv") { + continue + } + clean = append(clean, s) + } + return clean +} diff --git a/argv.print.go b/argv.print.go new file mode 100644 index 0000000..49b1089 --- /dev/null +++ b/argv.print.go @@ -0,0 +1,134 @@ +package argvpb + +// debug argv protobuf functions +// enable with --autodebug or Setenv( "AUTOCOMPLETE_VERBOSE" ) + +import ( + "fmt" + "os" + "strings" + + "go.wit.com/lib/cobol" + "go.wit.com/lib/config" +) + +func (pb *Argv) debugf(fmts string, parts ...any) { + debugf(fmts, parts...) +} + +// decides here to print to STDERR or not +func debugf(fmts string, parts ...any) { + fmts = strings.TrimSpace(fmts) + fmts += "\n" + // me.pb.Stderr += fmt.Sprintf(fmts, parts...) + fmt.Fprintf(Stddbg, fmts, parts...) +} + +// print out auto complete debugging info +func (pb *Argv) printDebug(last string) { + pb.printDebugNew("ARGV", me.last) +} + +func (pb *Argv) printDebugNew(msg string, last *Argv) { + // var arglast string + // arglast = fmt.Sprintf("last='%s'", last.GetCmd()) + partial := fmt.Sprintf("p='%s'", pb.Partial) + age := cobol.Duration(pb.Ctime) + pdur := cobol.Duration(pb.Duration) + argvdur := cobol.Duration(pb.ArgvDuration) + + var dbg string + if me.debug { + dbg = "dbg=1" + } else { + dbg = "dbg=0" + } + lens := fmt.Sprintf("len=%-2d,%-2d,%-2d", me.all.Len(), len(strings.Fields(pb.Stdout)), len(strings.Split(pb.Stderr, "\n"))) + fast := fmt.Sprintf("F%-2dout%-2derr%-2d %s", pb.Fast, pb.OutCounter, pb.ErrCounter, lens) + top := fmt.Sprintf("%-4.4s age=(%s)(%s)dur(%s) %s %s cmd=%-12.12s", pb.Uuid, age, pdur, argvdur, dbg, fast, pb.GetCmd()) + debugf("%s: %s %-12.12s real='%v'", msg, top, partial, pb.Real) +} + +func (all *Argvs) printHistory(msg string) { + counter := 0 + var last *Argv + // for pb := range all.Argv[0:10] { + for pb := range all.IterAll() { + counter += 1 + pb.printDebugNew(msg, last) + last = pb + if counter > 30 { + // sometimes I'm dumb + break + } + } +} + +func printStddbg() { + if !me.debug { + return + } + if config.Exists("/tmp/argv.debug") { + printStddbgFile() + return + } + lines := strings.Split(strings.TrimSpace(PB.Stddbg), "\n") + if len(lines) == 0 { + return + } + fmt.Fprintf(os.Stderr, "\n") + for _, line := range lines { + fmt.Fprintf(os.Stderr, "%s\n", line) + } + fmt.Fprintf(os.Stderr, "\n") +} + +func printStddbgFile() { + if !me.debug { + return + } + f, err := os.OpenFile("/tmp/argv.debug", os.O_APPEND|os.O_RDWR|os.O_CREATE, 0644) + if err != nil { + return + } + defer f.Close() + lines := strings.Split(strings.TrimSpace(PB.Stddbg), "\n") + if len(lines) == 0 { + return + } + fmt.Fprintf(f, "\n") + for _, line := range lines { + fmt.Fprintf(f, "%s\n", line) + } + fmt.Fprintf(f, "\n") +} + +func printStderr() { + var lines []string + for _, line := range strings.Split(strings.TrimSpace(PB.Stderr), "\n") { + if strings.TrimSpace(line) == "" { + continue + } + lines = append(lines, line) + } + if len(lines) == 0 { + return + } + fmt.Fprintf(os.Stderr, "\n") + for _, line := range lines { + // line = strings.TrimSpace(line) + // if line == "" { + // continue + // } + fmt.Fprintf(os.Stderr, "%s\n", line) + } + fmt.Fprintf(os.Stderr, "\n") +} + +func printStdout() { + line := strings.TrimSpace(PB.Stdout) + if line == "" { + return + } + fmt.Fprintf(os.Stdout, " %s\n", line) +} diff --git a/argv.version.go b/argv.version.go new file mode 100644 index 0000000..7882474 --- /dev/null +++ b/argv.version.go @@ -0,0 +1,44 @@ +package argvpb + +import ( + "fmt" + "os" + + "go.wit.com/lib/cobol" +) + +func Version() string { + if PB == nil || PB.AppInfo == nil { + return fmt.Sprintf("argv was not initialized by your application %v", os.Args) + } + return PB.AppInfo.getVersion() +} + +func (pb *Argv) Version() string { + return pb.AppInfo.getVersion() +} + +func doVersion(pb *Argv) { + fmt.Println(pb.AppInfo.getVersion()) + os.Exit(0) +} + +func (info *App) getVersion() string { + var s string + timeString, t, err := cobol.TimeCheck(info.BUILDTIME) + if t != nil { + // fmt.Printf("TIME getVersion(t != nil) ERR=(%v) t=(%v) AppInfo.BUILTIME is=(%v)\n", err, t, info.BUILDTIME) + return fmt.Sprintf("%s %s Built on %s", info.APPNAME, info.VERSION, cobol.Time(t)) + } else if err == nil { + s = fmt.Sprintf("%s %s Built on %s (argv.had(%s))", info.APPNAME, info.VERSION, timeString, info.BUILDTIME) + } else { + // fmt.Printf("TIME getVersion() ERR=(%v) timeString=(%v) AppInfo.BUILTIME was=(%v)\n", err, timeString, info.BUILDTIME) + s = fmt.Sprintf("%s %s Built on raw(%v) (argv had %s)", info.APPNAME, info.VERSION, timeString, info.BUILDTIME) + } + return s +} + +// deprecate ? +func GetAPPNAME() string { + return me.pb.AppInfo.APPNAME +} -- cgit v1.2.3