feat(cli): Improve scanner comparison in CompareCommand

If the scanners used for the packages are different, only show the entries that actually are different, not the whole lists. Signed-off-by: Martin Nonnenmacher <[email protected]>
oss-review-toolkit · Dec 8, 2023 · 47c1c0c · 47c1c0c
1 parent 99472dc
commit 47c1c0c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/plugins/commands/compare/src/main/kotlin/CompareCommand.kt b/plugins/commands/compare/src/main/kotlin/CompareCommand.kt
@@ -543,15 +543,19 @@ private fun ScannerRun?.diff(other: ScannerRun?, context: SemanticDiffContext):
             config = if (context.ignoreConfig) null else config.diff(other.config),
             provenancesA = (provenances - other.provenances).takeUnless { it.isEmpty() },
             provenancesB = (other.provenances - provenances).takeUnless { it.isEmpty() },
-            scannersA = scanners.takeIf { it != other.scanners },
-            scannersB = other.scanners.takeIf { it != scanners },
+            scannersA = scanners.diff(other.scanners).takeUnless { it.isEmpty() },
+            scannersB = other.scanners.diff(scanners).takeUnless { it.isEmpty() },
             filesA = if (context.ignoreFileList) null else (files - other.files).takeUnless { it.isEmpty() },
             filesB = if (context.ignoreFileList) null else (other.files - files).takeUnless { it.isEmpty() },
             scanResultDiff = differentResults.takeUnless { it.isEmpty() }
         )
     }
 }
 
+private fun Map<Identifier, Set<String>>.diff(other: Map<Identifier, Set<String>>): Map<Identifier, Set<String>> {
+    return filter { (id, values) -> other[id] != values }
+}
+
 private fun ScannerConfiguration?.diff(other: ScannerConfiguration?): ScannerConfigurationDiff? {
     if (this == other) return null