Skip to content

Commit

Permalink
Remove extra fields from conanReference as welll
Browse files Browse the repository at this point in the history
  • Loading branch information
another-rex committed Sep 30, 2024
1 parent 116969b commit 63ab732
Showing 1 changed file with 1 addition and 41 deletions.
42 changes: 1 addition & 41 deletions extractor/filesystem/language/cpp/conanlock/extractor.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ import (
type conanReference struct {
Name string
Version string
Username string
Channel string
RecipeRevision string
PackageID string
PackageRevision string
TimeStamp string
}

// conanGraphNode contains a subset of a graph entry that includes inventory information
Expand Down Expand Up @@ -54,41 +48,7 @@ func parseConanRenference(ref string) conanReference {
// very flexible format name/version[@username[/channel]][#rrev][:pkgid[#prev]][%timestamp]
var reference conanReference

parts := strings.SplitN(ref, "%", 2)
if len(parts) == 2 {
ref = parts[0]
reference.TimeStamp = parts[1]
}

parts = strings.SplitN(ref, ":", 2)
if len(parts) == 2 {
ref = parts[0]
parts = strings.SplitN(parts[1], "#", 2)
reference.PackageID = parts[0]
if len(parts) == 2 {
reference.PackageRevision = parts[1]
}
}

parts = strings.SplitN(ref, "#", 2)
if len(parts) == 2 {
ref = parts[0]
reference.RecipeRevision = parts[1]
}

parts = strings.SplitN(ref, "@", 2)
if len(parts) == 2 {
ref = parts[0]
usernameChannel := parts[1]

parts = strings.SplitN(usernameChannel, "/", 2)
reference.Username = parts[0]
if len(parts) == 2 {
reference.Channel = parts[1]
}
}

parts = strings.SplitN(ref, "/", 2)
parts := strings.SplitN(ref, "/", 2)
if len(parts) == 2 {
reference.Name = parts[0]
reference.Version = parts[1]
Expand Down

0 comments on commit 63ab732

Please sign in to comment.