rewriting logic to repolist

1 files changed, 21 insertions, 45 deletions

diff --git a/globalDisplayOptions.go b/globalDisplayOptions.go
index 196118e..606c767 100644
--- a/globalDisplayOptions.go
+++ b/globalDisplayOptions.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"os"
 	"strings"
 
 	"go.wit.com/gui"
@@ -46,20 +45,20 @@ func showHideRepos(repo *repolist.Repo) {
 	repo.Show()
 }
 
-func globalDisplayShow() {
-	for _, repo := range me.repos.View.AllRepos() {
-		if me.autoHideReadOnly.Checked() {
-			if repo.Status.ReadOnly() {
-				continue
-			}
+func globalDisplayShow(repo *repolist.Repo) {
+	if me.autoHideReadOnly.Checked() {
+		if repo.Status.ReadOnly() {
+			repo.Hide()
+			return
 		}
-		if me.autoHidePerfect.Checked() {
-			if repo.State() == "PERFECT" {
-				continue
-			}
+	}
+	if me.autoHidePerfect.Checked() {
+		if repo.State() == "PERFECT" {
+			repo.Hide()
+			return
 		}
-		repo.Show()
 	}
+	repo.Show()
 }
 
 func globalDisplayOptions(box *gui.Node) {
@@ -76,24 +75,13 @@ func globalDisplayOptions(box *gui.Node) {
 			me.repos.Hide()
 		}
 		log.Info("showing reposwin")
-		// showHideRepos()
-
-		// have to run this twice for now
-		// scanForReady()
-		// scanForReady()
-		// findNextDirty("")
-		// double check the found next repo
-		// fullDoubleCheckFix()
 	})
 	hidegrid.NextRow()
 
 	me.autoHideReadOnly = hidegrid.NewCheckbox("Hide read-only repos").SetChecked(true)
 	me.autoHideReadOnly.Custom = func() {
-		if me.autoHideReadOnly.Checked() {
-			// showHideRepos()
-		} else {
-			globalDisplayShow()
-		}
+		log.Info("registered hide function to globalDisplayShow()")
+		me.repos.View.RegisterHideFunction(globalDisplayShow)
 	}
 	hidegrid.NextRow()
 
@@ -101,13 +89,6 @@ func globalDisplayOptions(box *gui.Node) {
 	me.autoHidePerfect.Custom = func() {
 		log.Info("registered hide function to showHideRepos()")
 		me.repos.View.RegisterHideFunction(showHideRepos)
-		/*
-			if me.autoHidePerfect.Checked() {
-				showHideRepos()
-			} else {
-				globalDisplayShow()
-			}
-		*/
 	}
 	hidegrid.NextRow()
 
@@ -155,8 +136,6 @@ func globalDisplayOptions(box *gui.Node) {
 		scanForReady()
 
 		findNextDirty("")
-		// double check the found next repo
-		fullDoubleCheckFix()
 	})
 
 	me.setBranchesToMasterB = grid.NewButton("set all branches to master", func() {
@@ -183,23 +162,20 @@ func globalDisplayOptions(box *gui.Node) {
 	})
 
 	var longB *gui.Node
-	longB = grid.NewButton("redo go.sum", func() {
-		os.Unsetenv("GO111MODULE")
+	longB = grid.NewButton("redo all go.sum", func() {
 		longB.Disable()
 		me.Disable()
 		for _, repo := range me.repos.View.AllRepos() {
 			if whitelist(repo.GoPath()) {
 				continue
 			}
-			if repo.Status.ReadOnly() {
-				continue
-			}
-			if repo.Status.MakeRedomod() {
-				log.Info("redo go.sum failed on", repo.Name())
-				// me.Enable()
-				// longB.Enable()
-				// longB.SetLabel("FAILED")
-				// return
+			ok, err := repo.Status.MakeRedomod()
+			if !ok {
+				log.Info("redo go.sum failed on", repo.GoPath(), err)
+				me.Enable()
+				longB.Enable()
+				longB.SetLabel("FAILED")
+				return
 			}
 		}
 		log.Info("redo go.sum finished ok!")