github-mirror/ctop
1
0
Fork 0
mirror of https://github.com/bcicen/ctop.git synced 2025-12-06 15:16:41 +08:00
Code Issues Projects Releases 1 Wiki Activity

add WidgetUpdater interface to container, replace struct fields with metamap

Browse Source
This commit is contained in:
Bradley Cicenas
2017-03-06 08:25:59 +00:00
parent e1dc42db03
commit f102e48cc9
8 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sort.go
View File

@@ -14,10 +14,11 @@ var stateMap = map[string]int{
"paused": 2,
"exited": 1,
"created": 0,
"": 0,
}
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 nameSorter = func(c1, c2 *Container) bool { return c1.GetMeta("name") < c2.GetMeta("name") }
var Sorters = map[string]sortMethod{
"id": idSorter,
@@ -54,10 +55,12 @@ var Sorters = map[string]sortMethod{
},
"state": func(c1, c2 *Container) bool {
// Use secondary sort method if equal values
if c1.State == c2.State {
c1state := c1.GetMeta("state")
c2state := c2.GetMeta("state")
if c1state == c2state {
return nameSorter(c1, c2)
}
return stateMap[c1.State] > stateMap[c2.State]
return stateMap[c1state] > stateMap[c2state]
},
}
@@ -86,11 +89,11 @@ func (a Containers) Filter() (filtered []*Container) {
for _, c := range a {
// Apply name filter
if re.FindAllString(c.Name, 1) == nil {
if re.FindAllString(c.GetMeta("name"), 1) == nil {
continue
}
// Apply state filter
if !config.GetSwitchVal("allContainers") && c.State != "running" {
if !config.GetSwitchVal("allContainers") && c.GetMeta("state") != "running" {
continue
}
filtered = append(filtered, c)