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

move container state filtering into containermap

Browse Source
This commit is contained in:
Bradley Cicenas
2017-02-16 04:35:25 +00:00
parent a1f860a020
commit 5419337c17
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
containermap.go
View File

@@ -104,9 +104,15 @@ func (cm *ContainerMap) All() []*Container {
re := regexp.MustCompile(fmt.Sprintf(".*%s", filter)) re := regexp.MustCompile(fmt.Sprintf(".*%s", filter))
for _, c := range cm.containers { for _, c := range cm.containers {
if re.FindAllString(c.name, 1) != nil { // Apply name filter
containers = append(containers, c) if re.FindAllString(c.name, 1) == nil {
continue
} }
// Apply state filter
if !config.GetSwitchVal("allContainers") && c.state != "running" {
continue
}
containers = append(containers, c)
} }
sort.Sort(containers) sort.Sort(containers)

3
grid.go
View File

@@ -82,9 +82,6 @@ func (g *Grid) redrawRows() {
} }
ui.Body.AddRows(fieldHeader()) ui.Body.AddRows(fieldHeader())
for _, c := range g.containers { for _, c := range g.containers {
if !config.GetSwitchVal("allContainers") && c.state != "running" {
continue
}
ui.Body.AddRows(c.widgets.Row()) ui.Body.AddRows(c.widgets.Row())
} }