diff options
Diffstat (limited to 'scan.go')
| -rw-r--r-- | scan.go | 39 |
1 files changed, 18 insertions, 21 deletions
@@ -19,41 +19,38 @@ func (r *repo) newScan() bool { log.Warn("repo does not exist", r.getPath()) return false } - mn := r.status.GetMasterName() - r.masterName.Set(mn) + mn := r.status.GetMasterBranchName() + r.masterName.SetLabel(mn) mv := r.status.GetMasterVersion() - r.masterVersion.Set(mv) + r.masterVersion.SetLabel(mv) - dn := r.status.GetDevelName() - r.develName.Set(dn) + dn := r.status.GetDevelBranchName() + r.develName.SetLabel(dn) dv := r.status.GetDevelVersion() - r.develVersion.Set(dv) + r.develVersion.SetLabel(dv) - un := r.status.GetUserName() - r.userName.Set(un) + un := r.status.GetUserBranchName() + r.userName.SetLabel(un) uv := r.status.GetUserVersion() - r.userVersion.Set(uv) + r.userVersion.SetLabel(uv) cbname := r.status.GetCurrentBranchName() cbversion := r.status.GetCurrentBranchVersion() lasttag := r.status.GetLastTagVersion() - r.lastTag.Set(lasttag) - r.vLabel.Set(cbname + " " + cbversion) + r.lastTag.SetLabel(lasttag) + r.vLabel.SetLabel(cbname + " " + cbversion) - status := r.getStatus() - if status == "dirty" { - r.dirtyLabel.Set(status) - return false - } - if status == "merge" { - r.dirtyLabel.Set(status) - return false + if r.status.Changed() { + log.Warn("should scan here") } + status := r.status.GetStatus() + r.dirtyLabel.SetLabel(status) if status == "PERFECT" { - r.dirtyLabel.Set(status) + if me.autoHidePerfect.Checked() { + r.Hide() + } return true } - r.dirtyLabel.Set("unknown " + status) return false } |