Skip to content

Commit

Permalink
refactor(list-copyrights-command): Simplify passing on package configs
Browse files Browse the repository at this point in the history
Include the package configurations into the `OrtResult` and adjust
`processAllCopyrightStatements()` to consume them from the `OrtResult`.
This prepares for only passing on `OrtResult`s instead of `OrtResult`
`PackageConfigurationProvider` tuples.

Signed-off-by: Frank Viernau <frank_viernau@epam.com>
  • Loading branch information
fviernau committed Jan 16, 2024
1 parent 07d06bb commit 7754349
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
9 changes: 4 additions & 5 deletions helper-cli/src/main/kotlin/commands/ListCopyrightsCommand.kt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import org.ossreviewtoolkit.model.Identifier
import org.ossreviewtoolkit.model.config.CopyrightGarbage
import org.ossreviewtoolkit.model.config.orEmpty
import org.ossreviewtoolkit.model.readValue
import org.ossreviewtoolkit.model.utils.setPackageConfigurations
import org.ossreviewtoolkit.plugins.packageconfigurationproviders.dir.DirPackageConfigurationProvider
import org.ossreviewtoolkit.utils.common.expandTilde

Expand Down Expand Up @@ -77,13 +78,11 @@ internal class ListCopyrightsCommand : CliktCommand(

override fun run() {
val ortResult = readOrtResult(ortFile)
.setPackageConfigurations(DirPackageConfigurationProvider(packageConfigurationsDir))
val copyrightGarbage = copyrightGarbageFile?.readValue<CopyrightGarbage>().orEmpty()
val packageConfigurationProvider = DirPackageConfigurationProvider(packageConfigurationsDir)

val copyrightStatements = ortResult.processAllCopyrightStatements(
copyrightGarbage = copyrightGarbage.items,
packageConfigurationProvider = packageConfigurationProvider
).filter { packageId == null || it.packageId == packageId }
val copyrightStatements = ortResult.processAllCopyrightStatements(copyrightGarbage = copyrightGarbage.items)
.filter { packageId == null || it.packageId == packageId }
.filter { licenseId == null || it.license.toString() == licenseId }
.groupBy({ it.statement }, { it.rawStatements })
.mapValues { it.value.flatten().toSortedSet() }
Expand Down
5 changes: 2 additions & 3 deletions helper-cli/src/main/kotlin/utils/Extensions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,12 @@ internal fun OrtResult.downloadSources(id: Identifier, sourceCodeOrigin: SourceC
internal fun OrtResult.processAllCopyrightStatements(
omitExcluded: Boolean = true,
copyrightGarbage: Set<String> = emptySet(),
addAuthorsToCopyrights: Boolean = false,
packageConfigurationProvider: PackageConfigurationProvider = PackageConfigurationProvider.EMPTY
addAuthorsToCopyrights: Boolean = false
): List<ProcessedCopyrightStatement> {
val result = mutableListOf<ProcessedCopyrightStatement>()

val licenseInfoResolver = createLicenseInfoResolver(
packageConfigurationProvider = packageConfigurationProvider,
packageConfigurationProvider = this,
copyrightGarbage = CopyrightGarbage(copyrightGarbage.toSortedSet()),
addAuthorsToCopyrights = addAuthorsToCopyrights
)
Expand Down

0 comments on commit 7754349

Please sign in to comment.