toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move types.Volumes optional fields under a new type

Browse Source 
This allows us to hide those fields when they are not filled.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: d36952749d7db1a7dac40f7ddf3ed485f23b33fc
Component: engine
This commit is contained in:
Kenfe-Mickael Laventure
2016-10-11 11:49:26 -07:00
parent 2ab4700a6d
commit 3dd231fb94
5 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/engine/cli/command/formatter/disk_usage.go
View File

@ -288,7 +288,7 @@ func (c *diskUsageVolumesContext) Active() string {
used := 0
for _, v := range c.volumes {
if v.RefCount > 0 {
if v.UsageData.RefCount > 0 {
used++
}
}
@ -301,8 +301,8 @@ func (c *diskUsageVolumesContext) Size() string {
c.AddHeader(sizeHeader)
for _, v := range c.volumes {
if v.Size != -1 {
size += v.Size
if v.UsageData.Size != -1 {
size += v.UsageData.Size
}
}
@ -315,11 +315,11 @@ func (c *diskUsageVolumesContext) Reclaimable() string {
c.AddHeader(reclaimableHeader)
for _, v := range c.volumes {
if v.Size != -1 {
if v.RefCount == 0 {
reclaimable += v.Size
if v.UsageData.Size != -1 {
if v.UsageData.RefCount == 0 {
reclaimable += v.UsageData.Size
}
totalSize += v.Size
totalSize += v.UsageData.Size
}
}