From e797404ce2b57aafb9f65c1d79948002f74fbd79 Mon Sep 17 00:00:00 2001 From: jbaranick Date: Fri, 1 Mar 2024 16:28:57 -0800 Subject: [PATCH] Reduce nesting --- internal/boxcli/search.go | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/internal/boxcli/search.go b/internal/boxcli/search.go index e2a56a086d0..656e449b2ab 100644 --- a/internal/boxcli/search.go +++ b/internal/boxcli/search.go @@ -100,25 +100,26 @@ func printSearchResults( systemKey := "" var versions []string for i, pkgVersion := range pkg.Versions { - if pkgVersion.Version != "" { - if !showAll && i >= 10 { - resultsAreTrimmed = true - break - } + if pkgVersion.Version == "" { + continue + } + if !showAll && i >= 10 { + resultsAreTrimmed = true + break + } - var systems []string - for _, sys := range pkgVersion.Systems { - systems = append(systems, sys.System) - } - slices.Sort(systems) - key := strings.Join(systems, " ") - if systemKey != key && systemKey != "" { - tableWriter.AppendRow(table.Row{pkg.Name, columnize(versions, 2), systemKey}, rowConfigAutoMerge) - versions = nil - } - systemKey = key - versions = append(versions, pkgVersion.Version) + var systems []string + for _, sys := range pkgVersion.Systems { + systems = append(systems, sys.System) + } + slices.Sort(systems) + key := strings.Join(systems, " ") + if systemKey != key && systemKey != "" { + tableWriter.AppendRow(table.Row{pkg.Name, columnize(versions, 2), systemKey}, rowConfigAutoMerge) + versions = nil } + systemKey = key + versions = append(versions, pkgVersion.Version) } if len(versions) > 0 {