From 9f26bc2d444b662a8ee19700612d6cc31d71df63 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 26 Jan 2024 02:02:56 -0600 Subject: [PATCH] go status moving here Signed-off-by: Jeff Carr --- draw.go | 5 +++++ git.go | 12 ++++++------ gitConfig.go | 9 +++++++++ structs.go | 5 +++-- unix.go | 4 ++-- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/draw.go b/draw.go index 5a39e51..af13cca 100644 --- a/draw.go +++ b/draw.go @@ -124,11 +124,16 @@ func (rs *RepoStatus) drawGitStatus() { rs.dirtyLabel = gadgets.NewOneLiner(newgrid, "dirty") rs.readOnly = gadgets.NewOneLiner(newgrid, "read only") + rs.goSumStatus = gadgets.NewOneLiner(newgrid, "go mod status") rs.speed = gadgets.NewOneLiner(newgrid, "refresh speed =") rs.speedActual = gadgets.NewOneLiner(newgrid, "speed actual =") } +func (rs *RepoStatus) SetGoSumStatus(s string) { + rs.goSumStatus.SetText(s) +} + func (rs *RepoStatus) drawGitCommands() { rs.gitCommandsGroup = rs.window.Box().NewGroup("git commands") newgrid := rs.gitCommandsGroup.NewGrid("gridnuts", 2, 2) diff --git a/git.go b/git.go index 4b67898..19281c8 100644 --- a/git.go +++ b/git.go @@ -109,12 +109,12 @@ func (rs *RepoStatus) CheckDirty() bool { rs.dirtyLabel.SetValue("no") return false } - log.Log(WARN, "CheckDirty() true", rs.realPath.String()) - log.Log(WARN, "CheckDirty() cmd =", cmd) - log.Log(WARN, "CheckDirty() b =", b) - log.Log(WARN, "CheckDirty() path =", path) - log.Log(WARN, "CheckDirty() out =", out) - log.Log(WARN, "CheckDirty() err =", err) + log.Log(INFO, "CheckDirty() true", rs.realPath.String()) + log.Log(INFO, "CheckDirty() cmd =", cmd) + log.Log(INFO, "CheckDirty() b =", b) + log.Log(INFO, "CheckDirty() path =", path) + log.Log(INFO, "CheckDirty() out =", out) + log.Log(INFO, "CheckDirty() err =", err) rs.dirtyLabel.SetValue("dirty") return true diff --git a/gitConfig.go b/gitConfig.go index f849170..9e185a1 100644 --- a/gitConfig.go +++ b/gitConfig.go @@ -364,6 +364,15 @@ func (rs *RepoStatus) CheckGoSum() (bool, string) { log.Log(WARN, " NOT FOUND BUT IGNORING FOR NOW") } } + err, output := rs.RunCmd([]string{"git", "branch", "--remotes"}) + if err == nil { + lines := strings.Split(output, "\n") + for i, s := range lines { + log.Log(WARN, "add line", i, s) + } + } else { + log.Log(WARN, "git branch --remotes failed", err) + } return true, "" } diff --git a/structs.go b/structs.go index ffc38df..a966ab5 100644 --- a/structs.go +++ b/structs.go @@ -17,8 +17,9 @@ type RepoStatus struct { window *gadgets.BasicWindow - dirtyLabel *gadgets.OneLiner - readOnly *gadgets.OneLiner + dirtyLabel *gadgets.OneLiner + readOnly *gadgets.OneLiner + goSumStatus *gadgets.OneLiner path *gadgets.OneLiner goSrcPath *gadgets.OneLiner diff --git a/unix.go b/unix.go index 47dde92..2bc03c4 100644 --- a/unix.go +++ b/unix.go @@ -222,13 +222,13 @@ func VerifyLocalGoRepo(gorepo string) bool { // Form the path to the home Git directory gitDir := filepath.Join(usr.HomeDir, "go/src/", gorepo, ".git") - log.Log(WARN, "VerifyLocalGoRepo() checking directory:", gitDir) + log.Log(INFO, "VerifyLocalGoRepo() checking directory:", gitDir) if IsDirectory(gitDir) { return true } goDir := filepath.Join(usr.HomeDir, "go/src/", gorepo) gomod := goDir + "/go.mod" - log.Log(WARN, "VerifyLocalGoRepo() checking for go.mod :", gomod) + log.Log(INFO, "VerifyLocalGoRepo() checking for go.mod :", gomod) _, err = os.Stat(gomod) if os.IsNotExist(err) { return false