jcarr
/
repolist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

final commits before release 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2024-11-05 05:58:33 -06:00
parent 44d221697f
commit aaeb5de034
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
human.go
View File

@ -23,7 +23,7 @@ func (r *RepoRow) StandardHeader() string {
devel := r.Status.GetDevelVersion() devel := r.Status.GetDevelVersion()
user := r.Status.GetUserVersion() user := r.Status.GetUserVersion()
header := fmt.Sprintf("%-35s %5s %-12s %-12s %-20s %-20s %-20s %-15s", header := fmt.Sprintf("%-35s %5s %-10s %-10s %-20s %-20s %-20s %-15s",
r.Name(), shell.FormatDuration(dur), r.Name(), shell.FormatDuration(dur),
lastTag, target, lastTag, target,
master, devel, user, master, devel, user,
@ -37,15 +37,18 @@ func msg(w http.ResponseWriter, s string) {
fmt.Fprintln(w, s) fmt.Fprintln(w, s)
} }
func (v *RepoList) PrintReport(w http.ResponseWriter, readonly string, onlydirty string, perfect string) { func ReportHeader() string {
var count int return fmt.Sprintf("%-35s %5s %-10s %-10s %-20s %-20s %-20s %-15s",
header := fmt.Sprintf("%-35s %5s %-12s %-12s %-20s %-20s %-20s %-15s",
"REPO", "AGE", "REPO", "AGE",
"LAST", "TARGET", "LAST", "TARGET",
"MASTER", "DEVEL", "USER", "MASTER", "DEVEL", "USER",
"STATE") "STATE")
msg(w, header) }
func (v *RepoList) PrintReport(w http.ResponseWriter, readonly string, onlydirty string, perfect string) {
var count int
msg(w, ReportHeader())
loop := v.ReposSortByName() loop := v.ReposSortByName()
for loop.Scan() { for loop.Scan() {
@ -96,26 +99,26 @@ func (r *RepoRow) StandardReleaseHeader() string {
user := r.Status.GetUserVersion() user := r.Status.GetUserVersion()
target := r.Status.GetTargetVersion() target := r.Status.GetTargetVersion()
header := fmt.Sprintf("%-35s %5s %-10s %-10s %-10s %-10s %-20s %-15s", header := fmt.Sprintf("%-35s %5s %-10s %-10s %-10s %-20s %-20s %-15s",
r.Name(), r.Name(), shell.FormatDuration(dur), curname,
shell.FormatDuration(dur), lastTag, target,
curname, master, user,
lastTag,
master,
target,
user,
r.State()) r.State())
return header return header
} }
func ReleaseReportHeader() string {
return fmt.Sprintf("%-35s %5s %-10s %-10s %-10s %-20s %-20s %-15s",
"REPO", "AGE", "CUR BR",
"LAST", "TARGET",
"MASTER", "USER",
"STATE")
}
func (v *RepoList) PrintReleaseReport(w http.ResponseWriter, readonly string, perfect string) { func (v *RepoList) PrintReleaseReport(w http.ResponseWriter, readonly string, perfect string) {
var count int var count int
header := fmt.Sprintf("%-35s %5s %-10s %-10s %-10s %-10s %-20s %-15s", msg(w, ReleaseReportHeader())
"REPO", "AGE", "CUR BR",
"LAST", "MASTER", "TARGET", "USER",
"STATE")
msg(w, header)
loop := v.ReposSortByName() loop := v.ReposSortByName()
for loop.Scan() { for loop.Scan() {

3
scanIterator.go
View File

@ -97,6 +97,9 @@ func (r *RepoList) selectRepoAll() []*RepoRow {
if !repo.Status.InitOk { if !repo.Status.InitOk {
continue continue
} }
if repo.Status.Whitelist {
continue
}
repoPointers = append(repoPointers, repo) // Copy pointers for safe iteration repoPointers = append(repoPointers, repo) // Copy pointers for safe iteration
} }