simono41/dockviz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Print only labeled images with --only-labeled option

Browse source
This commit is contained in:
gkovacs81 2015-10-09 22:31:17 +02:00
parent 097bd3285b
commit 071f77cbbc
1 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
images.go
View file

@ -25,6 +25,7 @@ type ImagesCommand struct {
Tree bool `short:"t" long:"tree" description:"Show image information as tree."` Tree bool `short:"t" long:"tree" description:"Show image information as tree."`
Short bool `short:"s" long:"short" description:"Show short summary of images (repo name and list of tags)."` Short bool `short:"s" long:"short" description:"Show short summary of images (repo name and list of tags)."`
NoTruncate bool `short:"n" long:"no-trunc" description:"Don't truncate the image IDs."` NoTruncate bool `short:"n" long:"no-trunc" description:"Don't truncate the image IDs."`
OnlyLabeled bool `short:"l" long:"only-labeled" description:"Print only labeled images/containers."`
} }
var imagesCommand ImagesCommand var imagesCommand ImagesCommand
@ -125,7 +126,7 @@ func (x *ImagesCommand) Execute(args []string) error {
} }
} }
fmt.Printf(jsonToTree(images, startImage, imagesCommand.NoTruncate)) fmt.Printf(jsonToTree(images, startImage, imagesCommand.NoTruncate, imagesCommand.OnlyLabeled))
} else if imagesCommand.Short { } else if imagesCommand.Short {
fmt.Printf(jsonToShort(images)) fmt.Printf(jsonToShort(images))
} else { } else {
@ -135,7 +136,7 @@ func (x *ImagesCommand) Execute(args []string) error {
return nil return nil
} }
func jsonToTree(images *[]Image, startImageArg string, noTrunc bool) string { func jsonToTree(images *[]Image, startImageArg string, noTrunc bool, onlyLabeled bool) string {
var buffer bytes.Buffer var buffer bytes.Buffer
var startImage Image var startImage Image
@ -167,35 +168,53 @@ func jsonToTree(images *[]Image, startImageArg string, noTrunc bool) string {
} }
if startImageArg != "" { if startImageArg != "" {
WalkTree(&buffer, noTrunc, []Image{startImage}, byParent, "") WalkTree(&buffer, noTrunc, onlyLabeled, []Image{startImage}, byParent, "")
} else { } else {
WalkTree(&buffer, noTrunc, roots, byParent, "") WalkTree(&buffer, noTrunc, onlyLabeled, roots, byParent, "")
} }
return buffer.String() return buffer.String()
} }
func WalkTree(buffer *bytes.Buffer, noTrunc bool, images []Image, byParent map[string][]Image, prefix string) { func WalkTree(buffer *bytes.Buffer, noTrunc bool, onlyLabeled bool, images []Image, byParent map[string][]Image, prefix string) {
if len(images) > 1 { if len(images) > 1 {
length := len(images) length := len(images)
for index, image := range images { for index, image := range images {
if index+1 == length { if index+1 == length {
if onlyLabeled && image.RepoTags[0] != "<none>:<none>" || !onlyLabeled {
PrintTreeNode(buffer, noTrunc, image, prefix+"└─") PrintTreeNode(buffer, noTrunc, image, prefix+"└─")
}
if subimages, exists := byParent[image.Id]; exists { if subimages, exists := byParent[image.Id]; exists {
WalkTree(buffer, noTrunc, subimages, byParent, prefix+" ") if onlyLabeled && image.RepoTags[0] != "<none>:<none>" || !onlyLabeled {
WalkTree(buffer, noTrunc, onlyLabeled, subimages, byParent, prefix+" ")
} else {
WalkTree(buffer, noTrunc, onlyLabeled, subimages, byParent, prefix)
}
} }
} else { } else {
if onlyLabeled && image.RepoTags[0] != "<none>:<none>" || !onlyLabeled {
PrintTreeNode(buffer, noTrunc, image, prefix+"├─") PrintTreeNode(buffer, noTrunc, image, prefix+"├─")
}
if subimages, exists := byParent[image.Id]; exists { if subimages, exists := byParent[image.Id]; exists {
WalkTree(buffer, noTrunc, subimages, byParent, prefix+"│ ") if onlyLabeled && image.RepoTags[0] != "<none>:<none>" || !onlyLabeled {
WalkTree(buffer, noTrunc, onlyLabeled, subimages, byParent, prefix+"│ ")
} else {
WalkTree(buffer, noTrunc, onlyLabeled, subimages, byParent, prefix)
}
} }
} }
} }
} else { } else {
for _, image := range images { for _, image := range images {
if onlyLabeled && image.RepoTags[0] != "<none>:<none>" || !onlyLabeled {
PrintTreeNode(buffer, noTrunc, image, prefix+"└─") PrintTreeNode(buffer, noTrunc, image, prefix+"└─")
}
if subimages, exists := byParent[image.Id]; exists { if subimages, exists := byParent[image.Id]; exists {
WalkTree(buffer, noTrunc, subimages, byParent, prefix+" ") if onlyLabeled && image.RepoTags[0] != "<none>:<none>" || !onlyLabeled {
WalkTree(buffer, noTrunc, onlyLabeled, subimages, byParent, prefix+" ")
} else {
WalkTree(buffer, noTrunc, onlyLabeled, subimages, byParent, prefix)
}
} }
} }
} }