Adding size to FileDiff

Author: cftorres

differs/fileDiff.go

@@ -34,13 +34,15 @@ func diffImageFiles(image1, image2 utils.Image) (utils.DirDiff, error) {
 	sort.Strings(adds)
 	dels := utils.GetDeletedEntries(img1Dir, img2Dir)
 	sort.Strings(dels)
+	mods := utils.GetModifiedEntries(img1Dir, img2Dir)
+	sort.Strings(mods)
 
 	diff = utils.DirDiff{
 		Image1: image1.Source,
 		Image2: image2.Source,
 		Adds:   adds,
 		Dels:   dels,
-		Mods:   []string{},
+		Mods:   mods,
 	}
 	return diff, nil
 }

differs/nodeDiff.go

@@ -56,7 +56,7 @@ func (d NodeDiffer) getPackages(image utils.Image) (map[string]map[string]utils.
 			var currInfo utils.PackageInfo
 			currInfo.Version = packageJSON.Version
 			packagePath := strings.TrimSuffix(currPackage, "package.json")
-			size, err := utils.GetDirectorySize(packagePath)
+			size, err := utils.GetSize(packagePath)
 			if err != nil {
 				glog.Warningf("Error getting package size at %s: %s\n", currPackage, err)
 				return packages, err

differs/pipDiff.go

@@ -94,7 +94,7 @@ func (d PipDiffer) getPackages(image utils.Image) (map[string]map[string]utils.P
 				var size string
 				if i-1 >= 0 && contents[i-1].Name() == packageName {
 					packagePath := filepath.Join(pythonPath, packageName)
-					intSize, err := utils.GetDirectorySize(packagePath)
+					intSize, err := utils.GetSize(packagePath)
 					if err != nil {
 						glog.Errorf("Could not obtain size for package %s", packagePath)
 						size = ""

utils/fs_utils.go

@@ -9,9 +9,32 @@ import (
 	"strings"
 
 	"github.com/golang/glog"
+	"code.cloudfoundry.org/bytefmt"
 )
 
-func GetDirectorySize(path string) (int64, error) {
+// Directory stores a representaiton of a file directory.
+type Directory struct {
+	Root    string
+	Content []string
+}
+
+type DirectoryEntry struct {
+	Name string
+	Size string
+}
+
+func GetSize(path string) (int64, error) {
+	stat, err := os.Stat(path)
+	if err != nil {
+		return -1, errors.Errorf("Could not get size for %s: %s", path, err)
+	}
+	if stat.IsDir() {
+		return getDirectorySize(path)
+	}
+	return stat.Size(), nil
+}
+
+func getDirectorySize(path string) (int64, error) {
 	var size int64
 	err := filepath.Walk(path, func(_ string, info os.FileInfo, err error) error {
 		if !info.IsDir() {
@@ -109,9 +132,25 @@ func GetDeletedEntries(d1, d2 Directory) []string {
 type DirDiff struct {
 	Image1 string
 	Image2 string
-	Adds   []string
-	Dels   []string
-	Mods   []string
+	Adds   []DirectoryEntry
+	Dels   []DirectoryEntry
+	Mods   []DirectoryEntry
+}
+
+func createDirectoryEntries(entryNames []string) (entries []DirectoryEntry) {
+	for _, name := range entryNames {
+		strSize := ""
+		size, err := GetSize(name)
+		if err == nil {
+			strSize = bytefmt.ByteSize(size)
+		}
+		entry := DirectoryEntry{
+			Name: name,
+			Size: strSize,
+		}
+		entries = append(entries, entry)
+	}
+	return entries
 }
 
 // DiffDirectory takes the diff of two directories, assuming both are completely unpacked