Mirrored_Repos/ctop
1
0
Fork 0
mirror of https://github.com/bcicen/ctop.git synced 2024-08-30 18:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

move container sort to struct method

Browse Source
This commit is contained in:
Bradley Cicenas 2017-06-12 13:40:52 +00:00
parent aff6943d07
commit a48a9031cc
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
connector/docker.go
View File

@ -3,7 +3,6 @@ package connector
import ( import (
"fmt" "fmt"
"sort"
"strings" "strings"
"sync" "sync"
@ -161,7 +160,7 @@ func (cm *Docker) All() (containers container.Containers) {
for _, c := range cm.containers { for _, c := range cm.containers {
containers = append(containers, c) containers = append(containers, c)
} }
sort.Sort(containers) containers.Sort()
containers.Filter() containers.Filter()
cm.lock.Unlock() cm.lock.Unlock()
return containers return containers

3
connector/mock.go
View File

@ -4,7 +4,6 @@ package connector
import ( import (
"math/rand" "math/rand"
"sort"
"strings" "strings"
"time" "time"
@ -72,7 +71,7 @@ func (cs *Mock) Get(id string) (*container.Container, bool) {
// Return array of all containers, sorted by field // Return array of all containers, sorted by field
func (cs *Mock) All() container.Containers { func (cs *Mock) All() container.Containers {
sort.Sort(cs.containers) cs.containers.Sort()
cs.containers.Filter() cs.containers.Filter()
return cs.containers return cs.containers
} }

3
connector/runc.go
View File

@ -5,7 +5,6 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"sort"
"sync" "sync"
"time" "time"
@ -217,7 +216,7 @@ func (cm *Runc) All() (containers container.Containers) {
for _, c := range cm.containers { for _, c := range cm.containers {
containers = append(containers, c) containers = append(containers, c)
} }
sort.Sort(containers) containers.Sort()
containers.Filter() containers.Filter()
cm.lock.Unlock() cm.lock.Unlock()
return containers return containers

2
container/sort.go
View File

@ -3,6 +3,7 @@ package container
import ( import (
"fmt" "fmt"
"regexp" "regexp"
"sort"
"github.com/bcicen/ctop/config" "github.com/bcicen/ctop/config"
) )
@ -89,6 +90,7 @@ func SortFields() (fields []string) {
type Containers []*Container type Containers []*Container
func (a Containers) Sort() { sort.Sort(a) }
func (a Containers) Len() int { return len(a) } func (a Containers) Len() int { return len(a) }
func (a Containers) Swap(i, j int) { a[i], a[j] = a[j], a[i] } func (a Containers) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
func (a Containers) Less(i, j int) bool { func (a Containers) Less(i, j int) bool {