From 0ee6fd1e0d78a43f43e8c52a095027ea9939edd7 Mon Sep 17 00:00:00 2001 From: Gabe Cook Date: Sun, 24 Mar 2024 00:42:22 -0500 Subject: [PATCH] chore(gonesutil): Simplify filter returns --- cmd/gonesutil/ls/cmd.go | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/cmd/gonesutil/ls/cmd.go b/cmd/gonesutil/ls/cmd.go index bcba1f0a..421d5e0f 100644 --- a/cmd/gonesutil/ls/cmd.go +++ b/cmd/gonesutil/ls/cmd.go @@ -185,35 +185,25 @@ func deleteFunc(filters map[string]string) func(e *entry) bool { for field, filter := range filters { switch strings.ToLower(field) { case "name": - if !strings.Contains(strings.ToLower(e.Name), strings.ToLower(filter)) { - return true - } + return !strings.Contains(strings.ToLower(e.Name), strings.ToLower(filter)) case "mapper": parsed, err := strconv.ParseUint(filter, 10, 8) if err != nil { log.WithError(err).Fatal("invalid mapper filter value") } - if byte(parsed) != e.Mapper { - return true - } + return byte(parsed) != e.Mapper case "mirror": - if !strings.Contains(strings.ToLower(e.Mirror), strings.ToLower(filter)) { - return true - } + return !strings.Contains(strings.ToLower(e.Mirror), strings.ToLower(filter)) case "battery": parsed, err := strconv.ParseBool(filter) if err != nil { log.WithError(err).Fatal("invalid battery filter value") } - if parsed != e.Battery { - return true - } + return parsed != e.Battery case "hash": - if filter != e.Hash { - return true - } + return filter != e.Hash } } return false