Fix from-file bug for codebase packages

Here `from-file` attributes were being assigned after creation of
top level packages so we had them empty. Adds a temporary fix to
this.

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>

Author: AyanSinhaMahapatra

src/packagedcode/plugin_package.py

@@ -25,11 +25,11 @@
 from licensedcode.cache import build_spdx_license_expression
 from licensedcode.cache import get_cache
 from licensedcode.detection import DetectionRule
+from licensedcode.detection import populate_matches_with_path
 from packagedcode import get_package_handler
 from packagedcode.licensing import add_referenced_license_matches_for_package
 from packagedcode.licensing import add_referenced_license_detection_from_package
 from packagedcode.licensing import add_license_from_sibling_file
-from packagedcode.licensing import get_license_detection_mappings
 from packagedcode.licensing import get_license_expression_from_detection_mappings
 from packagedcode.models import add_to_package
 from packagedcode.models import Dependency
@@ -328,7 +328,17 @@ def create_package_and_deps(codebase, package_adder=add_to_package, strip_root=F
         strip_root=strip_root,
         **kwargs
     )
-    codebase.attributes.packages.extend(pkg.to_dict() for pkg in packages)
+
+    package_mappings = []
+    for package in packages:
+        for detection in package.license_detections:
+            populate_matches_with_path(
+                matches=detection["matches"],
+                path=package.datafile_paths[0],
+            )
+        package_mappings.append(package.to_dict())
+
+    codebase.attributes.packages.extend(package_mappings)
     codebase.attributes.dependencies.extend(dep.to_dict() for dep in dependencies)
 
 

tests/formattedcode/data/common/manifests-expected.json

@@ -34,7 +34,7 @@
               "score": 100.0,
               "start_line": 1,
               "end_line": 1,
-              "from_file": null,
+              "from_file": "manifests/maven/persistence-api-1.0.pom",
               "matched_length": 8,
               "match_coverage": 100.0,
               "matcher": "2-aho",
@@ -48,7 +48,7 @@
               "score": 100.0,
               "start_line": 2,
               "end_line": 2,
-              "from_file": null,
+              "from_file": "manifests/maven/persistence-api-1.0.pom",
               "matched_length": 7,
               "match_coverage": 100.0,
               "matcher": "2-aho",
@@ -127,7 +127,7 @@
               "score": 100.0,
               "start_line": 1,
               "end_line": 1,
-              "from_file": null,
+              "from_file": "manifests/npm-license-mapping/package.json",
               "matched_length": 3,
               "match_coverage": 100.0,
               "matcher": "1-hash",
@@ -147,7 +147,7 @@
               "score": 100.0,
               "start_line": 1,
               "end_line": 1,
-              "from_file": null,
+              "from_file": "manifests/npm-license-mapping/package.json",
               "matched_length": 3,
               "match_coverage": 100.0,
               "matcher": "1-hash",
@@ -222,7 +222,7 @@
               "score": 100.0,
               "start_line": 1,
               "end_line": 1,
-              "from_file": null,
+              "from_file": "manifests/npm-license-string/package.json",
               "matched_length": 1,
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",

tests/formattedcode/data/common/manifests-expected.jsonlines

@@ -66,7 +66,7 @@
                 "score": 100.0,
                 "start_line": 1,
                 "end_line": 1,
-                "from_file": null,
+                "from_file": "manifests/maven/persistence-api-1.0.pom",
                 "matched_length": 8,
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
@@ -80,7 +80,7 @@
                 "score": 100.0,
                 "start_line": 2,
                 "end_line": 2,
-                "from_file": null,
+                "from_file": "manifests/maven/persistence-api-1.0.pom",
                 "matched_length": 7,
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
@@ -159,7 +159,7 @@
                 "score": 100.0,
                 "start_line": 1,
                 "end_line": 1,
-                "from_file": null,
+                "from_file": "manifests/npm-license-mapping/package.json",
                 "matched_length": 3,
                 "match_coverage": 100.0,
                 "matcher": "1-hash",
@@ -179,7 +179,7 @@
                 "score": 100.0,
                 "start_line": 1,
                 "end_line": 1,
-                "from_file": null,
+                "from_file": "manifests/npm-license-mapping/package.json",
                 "matched_length": 3,
                 "match_coverage": 100.0,
                 "matcher": "1-hash",
@@ -254,7 +254,7 @@
                 "score": 100.0,
                 "start_line": 1,
                 "end_line": 1,
-                "from_file": null,
+                "from_file": "manifests/npm-license-string/package.json",
                 "matched_length": 1,
                 "match_coverage": 100.0,
                 "matcher": "1-spdx-id",

tests/formattedcode/data/common/manifests-expected.yaml

@@ -96,7 +96,7 @@ packages:
           - score: '100.0'
             start_line: 1
             end_line: 1
-            from_file:
+            from_file: manifests/maven/persistence-api-1.0.pom
             matched_length: 8
             match_coverage: '100.0'
             matcher: 2-aho
@@ -108,7 +108,7 @@ packages:
           - score: '100.0'
             start_line: 2
             end_line: 2
-            from_file:
+            from_file: manifests/maven/persistence-api-1.0.pom
             matched_length: 7
             match_coverage: '100.0'
             matcher: 2-aho
@@ -174,7 +174,7 @@ packages:
           - score: '100.0'
             start_line: 1
             end_line: 1
-            from_file:
+            from_file: manifests/npm-license-mapping/package.json
             matched_length: 3
             match_coverage: '100.0'
             matcher: 1-hash
@@ -189,7 +189,7 @@ packages:
           - score: '100.0'
             start_line: 1
             end_line: 1
-            from_file:
+            from_file: manifests/npm-license-mapping/package.json
             matched_length: 3
             match_coverage: '100.0'
             matcher: 1-hash
@@ -254,7 +254,7 @@ packages:
           - score: '100.0'
             start_line: 1
             end_line: 1
-            from_file:
+            from_file: manifests/npm-license-string/package.json
             matched_length: 1
             match_coverage: '100.0'
             matcher: 1-spdx-id

tests/formattedcode/data/yaml/package-and-licenses-expected.yaml

@@ -92,7 +92,7 @@ packages:
           - score: '100.0'
             start_line: 1
             end_line: 1
-            from_file:
+            from_file: package-and-licenses/setup.cfg
             matched_length: 3
             match_coverage: '100.0'
             matcher: 1-hash

tests/licensedcode/data/additional_licenses/additional_license_combined_test.expected.json

@@ -336,6 +336,7 @@
               "score": 100.0,
               "start_line": 1,
               "end_line": 1,
+              "from_file": "additional_license_combined_test.txt",
               "matched_length": 11,
               "match_coverage": 100.0,
               "matcher": "2-aho",
@@ -348,6 +349,7 @@
               "score": 100.0,
               "start_line": 3,
               "end_line": 3,
+              "from_file": "additional_license_combined_test.txt",
               "matched_length": 12,
               "match_coverage": 100.0,
               "matcher": "2-aho",
@@ -360,6 +362,7 @@
               "score": 100.0,
               "start_line": 5,
               "end_line": 5,
+              "from_file": "additional_license_combined_test.txt",
               "matched_length": 9,
               "match_coverage": 100.0,
               "matcher": "2-aho",
@@ -372,6 +375,7 @@
               "score": 100.0,
               "start_line": 5,
               "end_line": 9,
+              "from_file": "additional_license_combined_test.txt",
               "matched_length": 69,
               "match_coverage": 100.0,
               "matcher": "2-aho",
@@ -384,6 +388,7 @@
               "score": 100.0,
               "start_line": 12,
               "end_line": 12,
+              "from_file": "additional_license_combined_test.txt",
               "matched_length": 4,
               "match_coverage": 100.0,
               "matcher": "2-aho",

tests/licensedcode/data/additional_licenses/additional_license_directory_test.expected.json

@@ -144,6 +144,7 @@
               "score": 100.0,
               "start_line": 1,
               "end_line": 1,
+              "from_file": "additional_license_directory_test.txt",
               "matched_length": 9,
               "match_coverage": 100.0,
               "matcher": "2-aho",
@@ -156,6 +157,7 @@
               "score": 100.0,
               "start_line": 1,
               "end_line": 5,
+              "from_file": "additional_license_directory_test.txt",
               "matched_length": 69,
               "match_coverage": 100.0,
               "matcher": "2-aho",

tests/licensedcode/data/additional_licenses/additional_license_plugin_test.expected.json

@@ -84,6 +84,7 @@
               "score": 100.0,
               "start_line": 1,
               "end_line": 1,
+              "from_file": "additional_license_plugin_test.txt",
               "matched_length": 11,
               "match_coverage": 100.0,
               "matcher": "1-hash",

tests/licensedcode/data/licenses_reference_reporting/scan-matched-text-with-reference.expected.json

@@ -47,7 +47,7 @@
               "score": 100.0,
               "start_line": 1,
               "end_line": 1,
-              "from_file": null,
+              "from_file": "scan/package.json",
               "matched_length": 5,
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",

tests/licensedcode/data/licenses_reference_reporting/scan-with-reference.expected.json

@@ -47,7 +47,7 @@
               "score": 100.0,
               "start_line": 1,
               "end_line": 1,
-              "from_file": null,
+              "from_file": "scan/package.json",
               "matched_length": 5,
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",