oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-17 16:33:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor pkg.Collection (#2439)

Browse Source 
- remove "catalog" references
- add a separate add() function for readability

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
This commit is contained in:
Alex Goodman 2023-12-15 17:11:11 -05:00 committed by GitHub
parent 4eace4b141
commit 17c605822e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
syft/pkg/collection.go
View File

@ -21,7 +21,7 @@ type Collection struct {
// NewCollection returns a new empty Collection
func NewCollection(pkgs ...Package) *Collection {
catalog := Collection{
c := Collection{
byID: make(map[artifact.ID]Package),
idsByName: make(map[string]orderedIDSet),
idsByType: make(map[Type]orderedIDSet),
@ -29,10 +29,10 @@ func NewCollection(pkgs ...Package) *Collection {
}
for _, p := range pkgs {
catalog.Add(p)
c.Add(p)
}
return &catalog
return &c
}
// PackageCount returns the total number of packages that have been added.
@ -97,15 +97,21 @@ func (c *Collection) packages(ids []artifact.ID) (result []Package) {
return result
}
// Add n packages to the catalog.
// Add n packages to the collection.
func (c *Collection) Add(pkgs ...Package) {
for _, p := range pkgs {
c.add(p)
}
}
// Add a package to the Collection.
func (c *Collection) add(p Package) {
c.lock.Lock()
defer c.lock.Unlock()
for _, p := range pkgs {
id := p.ID()
if id == "" {
log.Warnf("found package with empty ID while adding to the catalog: %+v", p)
log.Warnf("found package with empty ID while adding to the collection: %+v", p)
p.SetID()
id = p.ID()
}
@ -122,7 +128,6 @@ func (c *Collection) Add(pkgs ...Package) {
}
c.addToIndex(p)
}
}
func (c *Collection) addToIndex(p Package) {
@ -242,7 +247,7 @@ func (c *Collection) Enumerate(types ...Type) <-chan Package {
defer close(channel)
if c == nil {
// we should allow enumerating from a catalog that was never created (which will result in no packages enumerated)
// we should allow enumerating from a collection that was never created (which will result in no packages enumerated)
return
}