working on release versioning

Signed-off-by: Jeff Carr <[email protected]>

1 files changed, 50 insertions, 19 deletions

diff --git a/releaseWindow.go b/releaseWindow.go
index 78ad1a7..b42eb27 100644
--- a/releaseWindow.go
+++ b/releaseWindow.go
@@ -25,9 +25,9 @@ type releaseStruct struct {
 
 	openrepo *gui.Node
 
-	goGetB *gui.Node
-	checkGoSumB *gui.Node
-	checkDirtyB *gui.Node
+	goGetB       *gui.Node
+	checkGoSumB  *gui.Node
+	checkDirtyB  *gui.Node
 	makeRedomodB *gui.Node
 	sendVersionB *gui.Node
 }
@@ -60,6 +60,7 @@ func createReleaseWindow() {
 		} else {
 			findNextRepo()
 		}
+		findDirty2()
 	})
 
 	release.openrepo = release.grid.NewButton("open repo", func() {
@@ -67,12 +68,12 @@ func createReleaseWindow() {
 			log.Info("find the next repo first")
 			return
 		}
-		if release.current.status.CheckGoSum() {
+		if ok, missing := release.current.status.CheckGoSum(); ok {
 			log.Info("repo has go.sum requirements that are clean")
 			release.status.SetValue("CLEAN")
 			release.current.goSumStatus.SetValue("CLEAN")
 		} else {
-			log.Info("repo has go.sum requirements that are screwed up")
+			log.Info("BAD repo has go.sum requirements that are screwed up. missing:", missing)
 			release.status.SetValue("BAD")
 			release.current.goSumStatus.SetValue("BAD")
 		}
@@ -122,16 +123,22 @@ func createReleaseWindow() {
 		buttonDisable()
 		tmp := release.current.String()
 		log.Info("Run CheckGoSum on repo:", tmp)
-		if release.current.status.CheckGoSum() {
+		if ok, missing := release.current.status.CheckGoSum(); ok {
 			log.Info("repo has go.sum requirements that are clean")
 			release.current.goSumStatus.SetValue("CLEAN")
 			release.current.goSumStatus.SetLabel("CLEAN")
 			release.current.goSumStatus.SetText("CLEAN")
 		} else {
-			log.Info("repo has go.sum requirements that are screwed up")
-			if release.current.goSumStatus.String() == "BAD" {
-				release.current.goSumStatus.SetLabel("BAD VERSION")
-				release.current.goSumStatus.SetText("BAD VERSION")
+			if missing == "" {
+				log.Info("BAD VERSION repo has go.sum requirements that are screwed up.", tmp)
+				if release.current.goSumStatus.String() == "BAD" {
+					release.current.goSumStatus.SetLabel("BAD VERSION")
+					release.current.goSumStatus.SetText("BAD VERSION")
+				}
+			} else {
+				log.Info("BAD VERSION repo has go.sum requirements that are screwed up.", tmp)
+				log.Info("BAD VERSION need to addRepo() the missing repo", missing)
+				// addRepo(reposgrid, missing, "master", "master", "master")
 			}
 		}
 		buttonEnable()
@@ -188,8 +195,32 @@ func buttonEnable() {
 	release.sendVersionB.Enable()
 }
 
+func findDirty2() bool {
+	for _, repo := range me.allrepos {
+		goSumS := repo.goSumStatus.String()
+		dirtyS := repo.dirtyLabel.String()
+
+		if goSumS == "IGNORE" {
+			continue
+		}
+
+		if goSumS == "DIRTY 2" {
+			log.Info("repo DIRTY 2", repo.String(), goSumS, dirtyS)
+			release.repo.SetValue(repo.status.String())
+			release.status.SetValue("dirty 2")
+			release.notes.SetValue("check dirty 2 manually")
+			release.current = repo
+			release.openrepo.Enable()
+			return true
+		} else {
+			log.Info("repo not DIRTY 2", repo.String(), goSumS, dirtyS)
+		}
+	}
+	return false
+}
+
 func findNextDirty() bool {
-	for repo, _ := range me.allrepos {
+	for _, repo := range me.allrepos {
 		goSumS := repo.goSumStatus.String()
 		dirtyS := repo.dirtyLabel.String()
 
@@ -216,11 +247,11 @@ func findNextDirty() bool {
 			return true
 		}
 		if goSumS == "DIRTY" {
-			if repo.status.CheckGoSum() {
+			if ok, missing := repo.status.CheckGoSum(); ok {
 				log.Info("repo has go.sum requirements that are clean")
 				// repo.goSumStatus.SetLabel("CLEAN")
 			} else {
-				log.Info("repo has go.sum requirements that are screwed up")
+				log.Info("DIRTY 2 repo has go.sum requirements that are screwed up. missing:", missing)
 				repo.goSumStatus.SetLabel("DIRTY 2")
 				continue
 			}
@@ -235,12 +266,12 @@ func findNextDirty() bool {
 			return true
 		}
 	}
-	log.Info("tried to find() but not sure what to do next")
+	log.Info("tried to findNextDirty() but not sure what to do next")
 	return false
 }
 
 func findNextRepo() {
-	for repo, _ := range me.allrepos {
+	for _, repo := range me.allrepos {
 		goSumS := repo.goSumStatus.String()
 		dirtyS := repo.dirtyLabel.String()
 
@@ -267,12 +298,12 @@ func findNextRepo() {
 			return
 		}
 		if goSumS == "DIRTY" {
-			if repo.status.CheckGoSum() {
+			if ok, missing := repo.status.CheckGoSum(); ok {
 				log.Info("repo has go.sum requirements that are clean")
 				// repo.goSumStatus.SetLabel("CLEAN")
 			} else {
-				log.Info("repo has go.sum requirements that are screwed up")
-				repo.goSumStatus.SetLabel("DIRTY 2")
+				log.Info("DIRTY 3 repo has go.sum requirements that are screwed up. missing:", missing)
+				repo.goSumStatus.SetLabel("DIRTY 3")
 				continue
 			}
 
@@ -294,5 +325,5 @@ func findNextRepo() {
 			return
 		}
 	}
-	log.Info("tried to find() but not sure what to do next")
+	log.Info("tried to findNextRepo() but not sure what to do next")
 }