@@ -109,41 +109,28 @@ class Scanner(
109109 suspend fun scan (ortResult : OrtResult , skipExcluded : Boolean , labels : Map <String , String >): OrtResult {
110110 val startTime = Instant .now()
111111
112- val projectScannerWrappers = scannerWrappers[PackageType .PROJECT ].orEmpty()
113- val packageScannerWrappers = scannerWrappers[PackageType .PACKAGE ].orEmpty()
114-
115- val projectResults = if (projectScannerWrappers.isNotEmpty()) {
116- val packages = ortResult.getProjects(skipExcluded).mapTo(mutableSetOf ()) { it.toPackage() }
117-
118- scan(
119- packages,
120- ScanContext (
121- ortResult.labels + labels,
122- PackageType .PROJECT ,
123- ortResult.repository.config.excludes,
124- scannerConfig.detectedLicenseMapping
125- )
112+ val projectPackages = ortResult.getProjects(skipExcluded).mapTo(mutableSetOf ()) { it.toPackage() }
113+ val projectResults = scan(
114+ projectPackages,
115+ ScanContext (
116+ ortResult.labels + labels,
117+ PackageType .PROJECT ,
118+ ortResult.repository.config.excludes,
119+ scannerConfig.detectedLicenseMapping
126120 )
127- } else {
128- ScannerRun .EMPTY
129- }
121+ )
130122
131- val packageResults = if (packageScannerWrappers.isNotEmpty()) {
132- val packages = ortResult.getPackages(skipExcluded).map { it.metadata }.filterNotConcluded()
133- .filterNotMetadataOnly().toSet()
134-
135- scan(
136- packages,
137- ScanContext (
138- ortResult.labels,
139- PackageType .PACKAGE ,
140- ortResult.repository.config.excludes,
141- scannerConfig.detectedLicenseMapping
142- )
123+ val packages = ortResult.getPackages(skipExcluded).map { it.metadata }.filterNotConcluded()
124+ .filterNotMetadataOnly().toSet()
125+ val packageResults = scan(
126+ packages,
127+ ScanContext (
128+ ortResult.labels,
129+ PackageType .PACKAGE ,
130+ ortResult.repository.config.excludes,
131+ scannerConfig.detectedLicenseMapping
143132 )
144- } else {
145- ScannerRun .EMPTY
146- }
133+ )
147134
148135 val endTime = Instant .now()
149136
0 commit comments