Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

list/tree: Align number right, text left 

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
(cherry picked from commit 18ab78882c)
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This commit is contained in:
Paweł Gronowski 2024-08-16 11:24:53 +02:00
parent ba43ae0bd2
commit 44a9ffa0ad
No known key found for this signature in database
GPG Key ID: B85EFCFE26DEF92A
1 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
cli/command/image/tree.go
View File

@ -58,6 +58,11 @@ func runTree(ctx context.Context, dockerCLI command.Cli, opts treeOptions) error
}, },
} }
if sub.Details.Used {
// Mark top-level parent image as used if any of its subimages are used.
details.Used = true
}
totalContent += im.Size.Content totalContent += im.Size.Content
children = append(children, sub) children = append(children, sub)
} }
@ -116,9 +121,14 @@ func printImageTree(dockerCLI command.Cli, images []topImage) error {
} }
columns := []imgColumn{ columns := []imgColumn{
{Title: "Image", Width: 0, Left: true}, {
Title: "Image",
Align: alignLeft,
Width: 0,
},
{ {
Title: "ID", Title: "ID",
Align: alignLeft,
Width: 12, Width: 12,
DetailsValue: func(d *imageDetails) string { DetailsValue: func(d *imageDetails) string {
return stringid.TruncateID(d.ID) return stringid.TruncateID(d.ID)
@ -126,6 +136,7 @@ func printImageTree(dockerCLI command.Cli, images []topImage) error {
}, },
{ {
Title: "Disk usage", Title: "Disk usage",
Align: alignRight,
Width: 10, Width: 10,
DetailsValue: func(d *imageDetails) string { DetailsValue: func(d *imageDetails) string {
return d.DiskUsage return d.DiskUsage
@ -133,6 +144,7 @@ func printImageTree(dockerCLI command.Cli, images []topImage) error {
}, },
{ {
Title: "Content size", Title: "Content size",
Align: alignRight,
Width: 12, Width: 12,
DetailsValue: func(d *imageDetails) string { DetailsValue: func(d *imageDetails) string {
return d.ContentSize return d.ContentSize
@ -140,6 +152,7 @@ func printImageTree(dockerCLI command.Cli, images []topImage) error {
}, },
{ {
Title: "Used", Title: "Used",
Align: alignCenter,
Width: 4, Width: 4,
Color: &greenColor, Color: &greenColor,
DetailsValue: func(d *imageDetails) string { DetailsValue: func(d *imageDetails) string {
@ -243,10 +256,18 @@ func printNames(out *streams.Out, headers []imgColumn, img topImage, color aec.A
} }
} }
type alignment int
const (
alignLeft alignment = iota
alignCenter
alignRight
)
type imgColumn struct { type imgColumn struct {
Title string Title string
Width int Width int
Left bool Align alignment
DetailsValue func(*imageDetails) string DetailsValue func(*imageDetails) string
Color *aec.ANSI Color *aec.ANSI
@ -260,14 +281,18 @@ func truncateRunes(s string, length int) string {
return s return s
} }
func (h imgColumn) Print(clr aec.ANSI, s string) (out string) { func (h imgColumn) Print(clr aec.ANSI, s string) string {
if h.Left { switch h.Align {
return h.PrintL(clr, s) case alignCenter:
return h.PrintC(clr, s)
case alignRight:
return h.PrintR(clr, s)
case alignLeft:
} }
return h.PrintC(clr, s) return h.PrintL(clr, s)
} }
func (h imgColumn) PrintC(clr aec.ANSI, s string) (out string) { func (h imgColumn) PrintC(clr aec.ANSI, s string) string {
ln := utf8.RuneCountInString(s) ln := utf8.RuneCountInString(s)
if ln > h.Width { if ln > h.Width {
@ -291,6 +316,15 @@ func (h imgColumn) PrintL(clr aec.ANSI, s string) string {
return clr.Apply(s) + strings.Repeat(" ", h.Width-ln) return clr.Apply(s) + strings.Repeat(" ", h.Width-ln)
} }
func (h imgColumn) PrintR(clr aec.ANSI, s string) string {
ln := utf8.RuneCountInString(s)
if ln > h.Width {
return clr.Apply(truncateRunes(s, h.Width))
}
return strings.Repeat(" ", h.Width-ln) + clr.Apply(s)
}
type noColor struct{} type noColor struct{}
func (a noColor) With(ansi ...aec.ANSI) aec.ANSI { func (a noColor) With(ansi ...aec.ANSI) aec.ANSI {