mirror of
https://github.com/bcicen/ctop.git
synced 2024-08-30 18:23:19 +00:00
move filter into own function
This commit is contained in:
parent
8f8474e468
commit
549d4892eb
@ -1,8 +1,6 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"regexp"
|
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@ -100,18 +98,7 @@ func (cm *ContainerMap) Del(ids ...string) {
|
|||||||
func (cm *ContainerMap) All() []*Container {
|
func (cm *ContainerMap) All() []*Container {
|
||||||
var containers Containers
|
var containers Containers
|
||||||
|
|
||||||
filter := config.GetVal("filterStr")
|
|
||||||
re := regexp.MustCompile(fmt.Sprintf(".*%s", filter))
|
|
||||||
|
|
||||||
for _, c := range cm.containers {
|
for _, c := range cm.containers {
|
||||||
// Apply name filter
|
|
||||||
if re.FindAllString(c.name, 1) == nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
// Apply state filter
|
|
||||||
if !config.GetSwitchVal("allContainers") && c.state != "running" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
containers = append(containers, c)
|
containers = append(containers, c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
22
sort.go
22
sort.go
@ -1,6 +1,9 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
|
"regexp"
|
||||||
|
|
||||||
"github.com/bcicen/ctop/config"
|
"github.com/bcicen/ctop/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -34,4 +37,23 @@ func (a Containers) Less(i, j int) bool {
|
|||||||
return f(a[i], a[j])
|
return f(a[i], a[j])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a Containers) Filter() (filtered []*Container) {
|
||||||
|
filter := config.GetVal("filterStr")
|
||||||
|
re := regexp.MustCompile(fmt.Sprintf(".*%s", filter))
|
||||||
|
|
||||||
|
for _, c := range a {
|
||||||
|
// Apply name filter
|
||||||
|
if re.FindAllString(c.name, 1) == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// Apply state filter
|
||||||
|
if !config.GetSwitchVal("allContainers") && c.state != "running" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
filtered = append(filtered, c)
|
||||||
|
}
|
||||||
|
|
||||||
|
return filtered
|
||||||
|
}
|
||||||
|
|
||||||
func sumNet(c *Container) int64 { return c.metrics.NetRx + c.metrics.NetTx }
|
func sumNet(c *Container) int64 { return c.metrics.NetRx + c.metrics.NetTx }
|
||||||
|
Loading…
Reference in New Issue
Block a user