From d67c2eb3a283138b5c08318b232311ecd8971f97 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Thu, 9 Jan 2025 04:03:30 -0600
Subject: [PATCH] cleanup output more

---
 main.go       | 12 ++++++++----
 protoParse.go | 10 +++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/main.go b/main.go
index 451ffd5..a9d1972 100644
--- a/main.go
+++ b/main.go
@@ -71,16 +71,20 @@ func main() {
 	log.Info("pwd = ", pwd)
 
 	if !shell.Exists("go.sum") {
-		shell.RunQuiet([]string{"go", "mod", "init"})
-		shell.RunQuiet([]string{"go", "mod", "tidy"})
-		shell.RunQuiet([]string{"go", "mod", "edit", "-go=1.18"}) // TODO: pass this as ENV. verify protobuf version needed
+		shell.RunQuiet([]string{"go-mod-clean"})
+		if !shell.Exists("go.sum") {
+			shell.RunQuiet([]string{"go", "mod", "init"})
+			shell.RunQuiet([]string{"go", "mod", "tidy"})
+			shell.RunQuiet([]string{"go", "mod", "edit", "-go=1.18"}) // TODO: pass this as ENV. verify protobuf version needed
+		}
 	}
 
 	var packageName string
 	var result cmd.Status
 	var cmd []string
 	if argv.Package == "" {
-		// TODO: switch to using forgepb
+		// TODO: switch to using forgepb (expose the functions/logic from forgepb directly
+		// it could be a bad idea to use forge.Init() here as forge needs this to build
 		// switch to forgepb
 		os.Setenv("GO111MODULE", "off") // keeps go list working if go version is back versioned for compatability
 		cmd = []string{"go", "list", "-f", "'{{.Name}}'"}
diff --git a/protoParse.go b/protoParse.go
index 49f382c..a27a4fb 100644
--- a/protoParse.go
+++ b/protoParse.go
@@ -44,8 +44,6 @@ func (pb *Files) findAutogenpb(f *File) error {
 				newm := parts[1]
 				if curmsg == nil {
 					log.Info("Error: Found Sort for:", newm, "however, this struct can't be used")
-					// log.Info("found marshal", newm)
-					marshalKeys = append(marshalKeys, newm)
 				} else {
 					log.Info("Found Sort for:", newm, "in struct", curmsg.Name)
 				}
@@ -56,11 +54,9 @@ func (pb *Files) findAutogenpb(f *File) error {
 		}
 		if strings.Contains(line, "autogenpb:unique") {
 			if parts[0] == "repeated" {
-				// log.Info("Found Unique for:", parts)
 				newu := parts[1]
 				newu = cases.Title(language.English, cases.NoLower).String(newu)
-				log.Info("found unique field", newu, "in struct", curmsg.Name)
-				// uniqueKeys = append(uniqueKeys, newu)
+				log.Info("Found unique field", newu, "in struct", curmsg.Name)
 			} else {
 				log.Info("Error:", line)
 				log.Info("Error: can not append on non repeated fields")
@@ -83,11 +79,11 @@ func (f *File) parseForMessage(line string) *MsgName {
 
 	if strings.Contains(line, "`autogenpb:mutex`") {
 		msg.DoMutex = true
-		log.Info("Found Mutex for:", msg.Name)
+		log.Info("Added Mutex=true:", msg.Name)
 	}
 	if strings.Contains(line, "`autogenpb:marshal`") {
 		msg.DoMarshal = true
-		log.Info("Found Marshal for:", msg.Name)
+		log.Info("Added Marshal=true:", msg.Name)
 	}
 	return msg
 }