From 80970dcee254a0f43168867fbe77bfb953e68172 Mon Sep 17 00:00:00 2001
From: Nate Jones <nate@endot.org>
Date: Sun, 8 Nov 2015 11:01:08 -0800
Subject: [PATCH] make calls consistent, move options to end

---
 images.go      | 20 ++++++++++----------
 images_test.go |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/images.go b/images.go
index c2893e6..2f885dc 100644
--- a/images.go
+++ b/images.go
@@ -110,7 +110,7 @@ func (x *ImagesCommand) Execute(args []string) error {
 		}
 
 		if imagesCommand.Tree {
-			fmt.Print(jsonToTree(imagesCommand.NoTruncate, roots, imagesByParent))
+			fmt.Print(jsonToTree(roots, imagesByParent, imagesCommand.NoTruncate))
 		}
 		if imagesCommand.Dot {
 			fmt.Print(jsonToDot(roots, imagesByParent))
@@ -163,10 +163,10 @@ IMAGES:
 	return startImage, nil
 }
 
-func jsonToTree(noTrunc bool, images []Image, byParent map[string][]Image) string {
+func jsonToTree(images []Image, byParent map[string][]Image, noTrunc bool) string {
 	var buffer bytes.Buffer
 
-	jsonToText(&buffer, noTrunc, images, byParent, "")
+	jsonToText(&buffer, images, byParent, noTrunc, "")
 
 	return buffer.String()
 }
@@ -235,33 +235,33 @@ func filterImages(images *[]Image, byParent *map[string][]Image) (filteredImages
 	return filteredImages, filteredChildren
 }
 
-func jsonToText(buffer *bytes.Buffer, noTrunc bool, images []Image, byParent map[string][]Image, prefix string) {
+func jsonToText(buffer *bytes.Buffer, images []Image, byParent map[string][]Image, noTrunc bool, prefix string) {
 	var length = len(images)
 	if length > 1 {
 		for index, image := range images {
 			var nextPrefix string = ""
 			if index+1 == length {
-				PrintTreeNode(buffer, noTrunc, image, prefix+"└─")
+				PrintTreeNode(buffer, image, noTrunc, prefix+"└─")
 				nextPrefix = "  "
 			} else {
-				PrintTreeNode(buffer, noTrunc, image, prefix+"├─")
+				PrintTreeNode(buffer, image, noTrunc, prefix+"├─")
 				nextPrefix = "│ "
 			}
 			if subimages, exists := byParent[image.Id]; exists {
-				jsonToText(buffer, noTrunc, subimages, byParent, prefix+nextPrefix)
+				jsonToText(buffer, subimages, byParent, noTrunc, prefix+nextPrefix)
 			}
 		}
 	} else {
 		for _, image := range images {
-			PrintTreeNode(buffer, noTrunc, image, prefix+"└─")
+			PrintTreeNode(buffer, image, noTrunc, prefix+"└─")
 			if subimages, exists := byParent[image.Id]; exists {
-				jsonToText(buffer, noTrunc, subimages, byParent, prefix+"  ")
+				jsonToText(buffer, subimages, byParent, noTrunc, prefix+"  ")
 			}
 		}
 	}
 }
 
-func PrintTreeNode(buffer *bytes.Buffer, noTrunc bool, image Image, prefix string) {
+func PrintTreeNode(buffer *bytes.Buffer, image Image, noTrunc bool, prefix string) {
 	var imageID string
 	if noTrunc {
 		imageID = image.Id
diff --git a/images_test.go b/images_test.go
index b88f154..a38afb7 100644
--- a/images_test.go
+++ b/images_test.go
@@ -123,7 +123,7 @@ func Test_Tree(t *testing.T) {
 		} else {
 			roots = collectRoots(im)
 		}
-		result := jsonToTree(treeTest.noTrunc, roots, byParent)
+		result := jsonToTree(roots, byParent, treeTest.noTrunc)
 
 		for _, regexp := range compileRegexps(t, treeTest.regexps) {
 			if !regexp.MatchString(result) {