From ceeab4c0d2bc72b9bd06f58052ee16cf834b1890 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Wed, 24 Jan 2024 22:22:34 -0600
Subject: working on release versioning

Signed-off-by: Jeff Carr <jcarr@wit.com>
---
 main.go | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

(limited to 'main.go')

diff --git a/main.go b/main.go
index 1c03f30..a2f89db 100644
--- a/main.go
+++ b/main.go
@@ -18,7 +18,7 @@ var resToolkit embed.FS
 
 func main() {
 	me = new(autoType)
-	me.allrepos = make(map[*repo]string)
+	me.allrepos = make(map[string]*repo)
 
 	me.myGui = gui.New()
 	me.myGui.InitEmbed(resToolkit)
@@ -34,6 +34,12 @@ func main() {
 }
 
 func addRepo(grid *gui.Node, path string, master string, devel string, user string) {
+	_, ok := me.allrepos[path]
+	if ok {
+		log.Info("addRepo() already had path", path)
+		return
+	}
+
 	newRepo := new(repo)
 
 	path = strings.Trim(path, "/") // trim any extranous '/' chars put in the config file by the user
@@ -76,16 +82,16 @@ func addRepo(grid *gui.Node, path string, master string, devel string, user stri
 	// newRepo.status = repostatus.New(me.myGui, newRepo.path)
 	newRepo.status = repostatus.NewRepoStatusWindow(newRepo.path)
 	newRepo.hidden = false
-	newRepo.status.SetMainWorkingName(me.mainBranch.String())
-	newRepo.status.SetDevelWorkingName(me.develBranch.String())
-	newRepo.status.SetUserWorkingName(me.userBranch.String())
+	newRepo.status.SetMainWorkingName(master)
+	newRepo.status.SetDevelWorkingName(devel)
+	newRepo.status.SetUserWorkingName(user)
 	/*
 		newRepo.status.SetDevelBranchName(devel)
 		newRepo.status.SetUserBranchName(user)
 		newRepo.status.Update()
 		newRepo.newScan()
 	*/
-	me.allrepos[newRepo] = path
+	me.allrepos[path] = newRepo
 }
 
 func autotypistWindow() {
@@ -145,5 +151,13 @@ func repoworld() {
 		}
 		addRepo(reposgrid, path, mbranch, dbranch, ubranch)
 	}
+
+	for i, path := range repostatus.ListGitDirectories() {
+		// log.Info("addRepo()", i, path)
+		tmp := strings.TrimPrefix(path, "/home/jcarr/go/src/")
+		log.Info("addRepo()", i, tmp)
+		addRepo(reposgrid, tmp, "master", "master", "master")
+	}
+
 	reposwin.Toggle()
 }
-- 
cgit v1.2.3