From 5018781cab7b7458588ad28b639d6d0749a4da67 Mon Sep 17 00:00:00 2001
From: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Date: Tue, 11 Oct 2016 11:49:26 -0700
Subject: [PATCH] Move types.Volumes optional fields under a new type

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

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
---
 command/formatter/disk_usage.go | 14 +++++++-------
 command/formatter/volume.go     |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/command/formatter/disk_usage.go b/command/formatter/disk_usage.go
index 866e9bd04a..acb210dbff 100644
--- a/command/formatter/disk_usage.go
+++ b/command/formatter/disk_usage.go
@@ -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
 		}
 	}
 
diff --git a/command/formatter/volume.go b/command/formatter/volume.go
index 8fb11732e3..7bc3537573 100644
--- a/command/formatter/volume.go
+++ b/command/formatter/volume.go
@@ -101,16 +101,16 @@ func (c *volumeContext) Label(name string) string {
 
 func (c *volumeContext) Links() string {
 	c.AddHeader(linksHeader)
-	if c.v.Size == -1 {
+	if c.v.UsageData == nil {
 		return "N/A"
 	}
-	return fmt.Sprintf("%d", c.v.RefCount)
+	return fmt.Sprintf("%d", c.v.UsageData.RefCount)
 }
 
 func (c *volumeContext) Size() string {
 	c.AddHeader(sizeHeader)
-	if c.v.Size == -1 {
+	if c.v.UsageData == nil {
 		return "N/A"
 	}
-	return units.HumanSize(float64(c.v.Size))
+	return units.HumanSize(float64(c.v.UsageData.Size))
 }