Include files in search only if we have the artifact

This commit is contained in:
Ettore Di Giacinto
2021-03-15 11:40:34 +01:00
parent 268239a561
commit 23513f2c75

View File

@@ -158,20 +158,23 @@ func searchOnline(term string, l list.Writer, t table.Writer, label, labelMatch,
} else { } else {
matches = synced.Search(term) matches = synced.Search(term)
} }
for _, m := range matches { for _, m := range matches {
if !revdeps { if !revdeps {
if !m.Package.IsHidden() || m.Package.IsHidden() && hidden { if !m.Package.IsHidden() || m.Package.IsHidden() && hidden {
t.AppendRow(packageToRow(m.Repo.GetName(), m.Package)) t.AppendRow(packageToRow(m.Repo.GetName(), m.Package))
packageToList(l, m.Repo.GetName(), m.Package) packageToList(l, m.Repo.GetName(), m.Package)
results.Packages = append(results.Packages, r := &PackageResult{
PackageResult{ Name: m.Package.GetName(),
Name: m.Package.GetName(), Version: m.Package.GetVersion(),
Version: m.Package.GetVersion(), Category: m.Package.GetCategory(),
Category: m.Package.GetCategory(), Repository: m.Repo.GetName(),
Repository: m.Repo.GetName(), Hidden: m.Package.IsHidden(),
Hidden: m.Package.IsHidden(), }
Files: m.Artifact.GetFiles(), if m.Artifact != nil {
}) r.Files = m.Artifact.GetFiles()
}
results.Packages = append(results.Packages, *r)
} }
} else { } else {
packs, _ := m.Repo.GetTree().GetDatabase().GetRevdeps(m.Package) packs, _ := m.Repo.GetTree().GetDatabase().GetRevdeps(m.Package)
@@ -179,15 +182,17 @@ func searchOnline(term string, l list.Writer, t table.Writer, label, labelMatch,
if !revdep.IsHidden() || revdep.IsHidden() && hidden { if !revdep.IsHidden() || revdep.IsHidden() && hidden {
t.AppendRow(packageToRow(m.Repo.GetName(), revdep)) t.AppendRow(packageToRow(m.Repo.GetName(), revdep))
packageToList(l, m.Repo.GetName(), revdep) packageToList(l, m.Repo.GetName(), revdep)
results.Packages = append(results.Packages, r := &PackageResult{
PackageResult{ Name: revdep.GetName(),
Name: revdep.GetName(), Version: revdep.GetVersion(),
Version: revdep.GetVersion(), Category: revdep.GetCategory(),
Category: revdep.GetCategory(), Repository: m.Repo.GetName(),
Repository: m.Repo.GetName(), Hidden: revdep.IsHidden(),
Hidden: revdep.IsHidden(), }
Files: m.Artifact.GetFiles(), if m.Artifact != nil {
}) r.Files = m.Artifact.GetFiles()
}
results.Packages = append(results.Packages, *r)
} }
} }
} }