Skip to content

Commit 8992e0c

Browse files
committed
refactor(scanoss): Rename variables for better path distinction
Rename variables to clearly identify local vs OSS contexts, making code more readable and reducing confusion between different path references. Signed-off-by: Agustin Isasmendi <[email protected]>
1 parent 2d76a7e commit 8992e0c

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

plugins/scanners/scanoss/src/main/kotlin/ScanOssResultParser.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ internal fun generateSummary(startTime: Instant, endTime: Instant, results: List
5151
result.fileDetails.forEach { details ->
5252
when (details.matchType) {
5353
MatchType.file -> {
54-
val file = requireNotNull(result.filePath)
55-
licenseFindings += getLicenseFindings(details, file)
56-
copyrightFindings += getCopyrightFindings(details, file)
54+
val localFile = requireNotNull(result.filePath)
55+
licenseFindings += getLicenseFindings(details, localFile)
56+
copyrightFindings += getCopyrightFindings(details, localFile)
5757
}
5858

5959
MatchType.snippet -> {
60-
val file = requireNotNull(result.filePath)
61-
val lines = requireNotNull(details.lines)
62-
val sourceLocations = convertLines(file, lines)
60+
val localFile = requireNotNull(result.filePath)
61+
val localLines = requireNotNull(details.lines)
62+
val sourceLocations = convertLines(localFile, localLines)
6363
val snippets = getSnippets(details)
6464

6565
snippets.forEach { snippet ->
@@ -147,14 +147,14 @@ private fun getSnippets(details: ScanFileDetails): Set<Snippet> {
147147
.toExpression()?.sorted() ?: SpdxLicenseIdExpression(SpdxConstants.NOASSERTION)
148148

149149
val score = matched.substringBeforeLast("%").toFloat()
150-
val locations = convertLines(ossFile, ossLines)
150+
val ossLocations = convertLines(ossFile, ossLines)
151151
// TODO: No resolved revision is available. Should a ArtifactProvenance be created instead ?
152152
val vcsInfo = VcsHost.parseUrl(url.takeUnless { it == "none" }.orEmpty())
153153
val provenance = RepositoryProvenance(vcsInfo, ".")
154154

155155
return buildSet {
156156
purls.forEach { purl ->
157-
locations.forEach { snippetLocation ->
157+
ossLocations.forEach { snippetLocation ->
158158
add(Snippet(score, snippetLocation, provenance, purl, license))
159159
}
160160
}

0 commit comments

Comments
 (0)