From b529d41091082a73686ff15b070fd26aea58e2f4 Mon Sep 17 00:00:00 2001
From: Bradley Cicenas <bradley@vektor.nyc>
Date: Thu, 23 Feb 2017 01:32:35 +0000
Subject: [PATCH] add secondary sort by name

---
 container.go |  1 +
 sort.go      | 39 +++++++++++++++++++++++++++++++++------
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/container.go b/container.go
index 9f50cda..a039d60 100644
--- a/container.go
+++ b/container.go
@@ -32,6 +32,7 @@ func (c *Container) SetState(s string) {
 }
 
 func (c *Container) Collect() {
+	log.Infof("starting collector for container: %s", c.id)
 	c.collect.Start()
 	go func() {
 		for metrics := range c.collect.Stream() {
diff --git a/sort.go b/sort.go
index 5584c41..8574083 100644
--- a/sort.go
+++ b/sort.go
@@ -9,13 +9,40 @@ import (
 
 type sortMethod func(c1, c2 *Container) bool
 
+func lessStr(s1, s2 string) bool { return s1 < s2 }
+
+var idSorter = func(c1, c2 *Container) bool { return c1.id < c2.id }
+var nameSorter = func(c1, c2 *Container) bool { return c1.name < c2.name }
+
 var Sorters = map[string]sortMethod{
-	"id":    func(c1, c2 *Container) bool { return c1.id < c2.id },
-	"name":  func(c1, c2 *Container) bool { return c1.name < c2.name },
-	"cpu":   func(c1, c2 *Container) bool { return c1.metrics.CPUUtil < c2.metrics.CPUUtil },
-	"mem":   func(c1, c2 *Container) bool { return c1.metrics.MemUsage < c2.metrics.MemUsage },
-	"mem %": func(c1, c2 *Container) bool { return c1.metrics.MemPercent < c2.metrics.MemPercent },
-	"net":   func(c1, c2 *Container) bool { return sumNet(c1) < sumNet(c2) },
+	"id":   idSorter,
+	"name": nameSorter,
+	"cpu": func(c1, c2 *Container) bool {
+		if c1.metrics.CPUUtil == c2.metrics.CPUUtil {
+			return nameSorter(c1, c2)
+		}
+		return c1.metrics.CPUUtil < c2.metrics.CPUUtil
+	},
+	"mem": func(c1, c2 *Container) bool {
+		if c1.metrics.MemUsage == c2.metrics.MemUsage {
+			return nameSorter(c1, c2)
+		}
+		return c1.metrics.MemUsage < c2.metrics.MemUsage
+	},
+	"mem %": func(c1, c2 *Container) bool {
+		if c1.metrics.MemPercent == c2.metrics.MemPercent {
+			return nameSorter(c1, c2)
+		}
+		return c1.metrics.MemPercent < c2.metrics.MemPercent
+	},
+	"net": func(c1, c2 *Container) bool {
+		sum1 := sumNet(c1)
+		sum2 := sumNet(c2)
+		if sum1 == sum2 {
+			return nameSorter(c1, c2)
+		}
+		return sum1 < sum2
+	},
 	"state": func(c1, c2 *Container) bool {
 		if c1.state == "running" {
 			return true