Networking/ccl
1
0
Fork 0
mirror of https://gitea.elkins.co/Networking/ccl.git synced 2025-03-09 12:41:40 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

ls: Improve column alignment

Browse Source
This commit is contained in:
Joel Elkins 2024-02-24 15:53:03 -06:00
parent 16e1c7ba20
commit 7222c6ba7f
No known key found for this signature in database
GPG Key ID: 133589DC38921AE2
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/ls.go
View File

@ -144,7 +144,7 @@ ccl ls squid`,
if err != nil {
fmt.Fprintf(cmd.OutOrStderr(), "Error marshalling results: %s", err)
}
fmt.Fprintf(w, string(val))
fmt.Fprint(w, string(val))
return
}
@ -152,11 +152,12 @@ ccl ls squid`,
defer tw.Flush()
if conn != nil {
titlemsg := "CATEGORY\tGROUP\tNAME\tIMAGE\tCREATED\t RUNNING\tCPU%\tMEM%"
block := "%s\t%5d\t%s\t%s\t%s\t%s\t%.1f\t%.1f\n"
fmt.Fprintf(tw, "%s\n", titlemsg)
titlemsg := "CATEGORY\tGROUP\tNAME\tIMAGE\tCREATED\t RUNNING\t CPU%\t MEM%\t\n"
block := "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t\n"
fmt.Fprint(tw, titlemsg)
for _, c := range conts {
data := []interface{}{c.Category, c.StartGroup, c.Name, c.Image}
data := make([]any, 0, 8)
data = append(data, c.Category, fmt.Sprintf("%5d", c.StartGroup), c.Name, c.Image)
if c.IsCreated() {
data = append(data, " ✓")
} else {
@ -173,9 +174,9 @@ ccl ls squid`,
data = append(data, "")
}
if stats := c.GetStats(); c.IsRunning() && stats != nil {
data = append(data, stats.CPU, stats.MemPerc)
data = append(data, fmt.Sprintf("%5.1f", stats.CPU), fmt.Sprintf("%5.1f", stats.MemPerc))
} else {
data = append(data, 0.0, 0.0)
data = append(data, "", "")
}
fmt.Fprintf(tw, block, data...)
}