guireleaser builds again

1 files changed, 61 insertions, 62 deletions

diff --git a/globalDisplayOptions.go b/globalDisplayOptions.go
index 401ce68..6bf9cdb 100644
--- a/globalDisplayOptions.go
+++ b/globalDisplayOptions.go
@@ -11,21 +11,21 @@ import (
 )
 
 func showHideRepos() {
-	for _, repo := range me.allrepos {
+	for _, repo := range me.repos.View.AllRepos() {
 		if me.autoHideReadOnly.Checked() {
-			if repo.status.ReadOnly() {
+			if repo.Status.ReadOnly() {
 				repo.Hide()
 				continue
 			}
 		}
 		if me.autoHidePerfect.Checked() {
-			if repo.dirtyLabel.String() == "PERFECT" {
+			if repo.State() == "PERFECT" {
 				repo.Hide()
 				continue
 			}
 		}
 		if me.autoReleased.Checked() {
-			if repo.getGoSumStatus() == "RELEASED" {
+			if repo.Status.GetGoSumStatus() == "RELEASED" {
 				repo.Hide()
 				continue
 			}
@@ -35,14 +35,14 @@ func showHideRepos() {
 }
 
 func globalDisplayShow() {
-	for _, repo := range me.allrepos {
+	for _, repo := range me.repos.View.AllRepos() {
 		if me.autoHideReadOnly.Checked() {
-			if repo.status.ReadOnly() {
+			if repo.Status.ReadOnly() {
 				continue
 			}
 		}
 		if me.autoHidePerfect.Checked() {
-			if repo.dirtyLabel.String() == "PERFECT" {
+			if repo.State() == "PERFECT" {
 				continue
 			}
 		}
@@ -56,20 +56,19 @@ func globalDisplayOptions(box *gui.Node) {
 	group1 := vbox.NewGroup("Global Display Options")
 
 	group1.NewButton("Show Repository Window", func() {
-		if reposwin.Hidden() {
-			log.Info("showing reposwin")
-			showHideRepos()
-			// have to run this twice for now
-			scanForReady()
-			scanForReady()
-			reposwin.Show()
-			findNextDirty("")
-			// double check the found next repo
-			fullDoubleCheckFix()
+		if me.repos.Hidden() {
+			me.repos.Show()
 		} else {
-			log.Info("hiding reposwin")
-			reposwin.Hide()
+			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()
 	})
 
 	me.autoHideReadOnly = group1.NewCheckbox("Hide read-only repos").SetChecked(true)
@@ -93,13 +92,13 @@ func globalDisplayOptions(box *gui.Node) {
 	me.autoReleased = group1.NewCheckbox("Hide RELEASED repos").SetChecked(false)
 	me.autoReleased.Custom = func() {
 		if me.autoReleased.Checked() {
-			for _, repo := range me.allrepos {
-				if repo.getGoSumStatus() == "RELEASED" {
+			for _, repo := range me.repos.View.AllRepos() {
+				if repo.Status.GetGoSumStatus() == "RELEASED" {
 					repo.Hide()
 				}
 			}
 		} else {
-			for _, repo := range me.allrepos {
+			for _, repo := range me.repos.View.AllRepos() {
 				repo.Show()
 			}
 		}
@@ -111,21 +110,21 @@ func globalDisplayOptions(box *gui.Node) {
 
 	me.setBranchesToMasterB = group1.NewButton("set all branches to master", func() {
 		me.Disable()
-		for _, repo := range me.allrepos {
-			if repo.status.ReadOnly() {
+		for _, repo := range me.repos.View.AllRepos() {
+			if repo.Status.ReadOnly() {
 				continue
 			}
-			if whitelist(repo.String()) {
+			if whitelist(repo.GoPath()) {
 				continue
 			}
-			if repo.status.CheckoutMaster() {
-				log.Warn("set master branch worked", repo.String())
-				repo.newScan()
+			if repo.Status.CheckoutMaster() {
+				log.Warn("set master branch worked", repo.Name())
+				repo.Status.UpdateNew()
 			} else {
-				repo.newScan()
-				log.Warn("set master branch failed", repo.String())
-				log.Warn("set master branch failed", repo.String())
-				log.Warn("set master branch failed", repo.String())
+				repo.Status.UpdateNew()
+				log.Warn("set master branch failed", repo.Name())
+				log.Warn("set master branch failed", repo.Name())
+				log.Warn("set master branch failed", repo.Name())
 			}
 		}
 		me.Enable()
@@ -137,15 +136,15 @@ func globalDisplayOptions(box *gui.Node) {
 		os.Unsetenv("GO111MODULE")
 		longB.Disable()
 		me.Disable()
-		for _, repo := range me.allrepos {
-			if whitelist(repo.String()) {
+		for _, repo := range me.repos.View.AllRepos() {
+			if whitelist(repo.GoPath()) {
 				continue
 			}
-			if repo.status.ReadOnly() {
+			if repo.Status.ReadOnly() {
 				continue
 			}
-			if repo.status.MakeRedomod() {
-				log.Info("redo go.sum failed on", repo.String())
+			if repo.Status.MakeRedomod() {
+				log.Info("redo go.sum failed on", repo.Name())
 				// me.Enable()
 				// longB.Enable()
 				// longB.SetLabel("FAILED")
@@ -160,54 +159,54 @@ func globalDisplayOptions(box *gui.Node) {
 
 	group1.NewButton("rm -f go.mod go.sum", func() {
 		me.Disable()
-		for _, repo := range me.allrepos {
-			if whitelist(repo.String()) {
+		for _, repo := range me.repos.View.AllRepos() {
+			if whitelist(repo.GoPath()) {
 				continue
 			}
-			if repo.status.ReadOnly() {
+			if repo.Status.ReadOnly() {
 				continue
 			}
-			repo.status.RunCmd([]string{"rm", "-f", "go.mod", "go.sum"})
+			repo.Status.RunCmd([]string{"rm", "-f", "go.mod", "go.sum"})
 		}
 		me.Enable()
 	})
 
 	group1.NewButton("git reset --hard", func() {
 		me.Disable()
-		for _, repo := range me.allrepos {
-			if whitelist(repo.String()) {
-				log.Warn("skipping whitelist", repo.String())
+		for _, repo := range me.repos.View.AllRepos() {
+			if whitelist(repo.GoPath()) {
+				log.Warn("skipping whitelist", repo.Name())
 				continue
 			}
-			log.Warn("running git reset --hard", repo.String())
-			repo.status.RunCmd([]string{"git", "reset", "--hard"})
+			log.Warn("running git reset --hard", repo.Name())
+			repo.Status.RunCmd([]string{"git", "reset", "--hard"})
 		}
 		me.Enable()
 	})
 
 	group1.NewButton("git ls-files |grep go.mod", func() {
 		// var all []string
-		for _, repo := range me.allrepos {
-			log.Info("repo:", repo.String())
-			if repo.status.ReadOnly() {
+		for _, repo := range me.repos.View.AllRepos() {
+			log.Info("repo:", repo.Name())
+			if repo.Status.ReadOnly() {
 				continue
 			}
-			if whitelist(repo.String()) {
-				log.Warn("skipping whitelist", repo.String())
+			if whitelist(repo.GoPath()) {
+				log.Warn("skipping whitelist", repo.GoPath())
 				continue
 			}
-			good, files := repo.status.GitLsFiles()
+			good, files := repo.Status.GitLsFiles()
 			if !good {
-				log.Warn("Something went wrong", repo.String())
+				log.Warn("Something went wrong", repo.GoPath())
 				continue
 			}
 			for _, filename := range strings.Split(files, "\n") {
 				log.Info("\tfile", filename)
 				if filename == "go.mod" {
 					log.Info("Found go.mod. does version match release version?")
-					log.Info(repo.lastTag.String(), "vs", repo.targetVersion.String())
-					if repo.lastTag.String() != repo.targetVersion.String() {
-						log.Info(repo.lastTag.String(), "vs", repo.targetVersion.String())
+					log.Info(repo.Status.GetLastTagVersion(), "vs", repo.Status.GetTargetVersion())
+					if repo.Status.GetLastTagVersion() != repo.Status.GetTargetVersion() {
+						log.Info(repo.Status.GetLastTagVersion(), "vs", repo.Status.GetTargetVersion())
 						log.Info("Found go.sum. version mismatch")
 						setCurrentRepo(repo, "VERY BROKEN", "rewind go.mod commit")
 						return
@@ -215,9 +214,9 @@ func globalDisplayOptions(box *gui.Node) {
 				}
 				if filename == "go.sum" {
 					log.Info("Found go.sum. does version match release version?")
-					log.Info(repo.lastTag.String(), "vs", repo.targetVersion.String())
-					if repo.lastTag.String() != repo.targetVersion.String() {
-						log.Info(repo.lastTag.String(), "vs", repo.targetVersion.String())
+					log.Info(repo.Status.GetLastTagVersion(), "vs", repo.Status.GetTargetVersion())
+					if repo.Status.GetLastTagVersion() != repo.Status.GetTargetVersion() {
+						log.Info(repo.Status.GetLastTagVersion(), "vs", repo.Status.GetTargetVersion())
 						log.Info("Found go.sum. version mismatch")
 						setCurrentRepo(repo, "VERY BROKEN", "rewind go.mod commit")
 						return
@@ -239,9 +238,9 @@ func globalDisplayOptions(box *gui.Node) {
 }
 
 func hidePerfect() {
-	for _, repo := range me.allrepos {
-		if repo.dirtyLabel.String() == "PERFECT" {
-			if repo.hidden {
+	for _, repo := range me.repos.View.AllRepos() {
+		if repo.State() == "PERFECT" {
+			if repo.Hidden() {
 				continue
 			}
 			repo.Hide()