Update assemble_from_many

    * Yield packages before resources and assign resources to packages before yielding resources

Signed-off-by: Jono Yang <jyang@nexb.com>

Author: JonoYang

src/packagedcode/alpine.py

@@ -97,7 +97,6 @@ def assemble(cls, package_data, resource, codebase, package_adder):
             # path is found and processed: remove it, so we can check if we
             # found all of them
             del file_references_by_path[res.path]
-            package_adder(package_uid, res, codebase)
             resources.append(res)
 
         # if we have left over file references, add these to extra data
@@ -106,7 +105,9 @@ def assemble(cls, package_data, resource, codebase, package_adder):
             package.extra_data['missing_file_references'] = missing
 
         yield package
-        yield from resources
+        for res in resources:
+            package_adder(package_uid, res, codebase)
+            yield res
 
         dependent_packages = package_data.dependencies
         if dependent_packages:

src/packagedcode/models.py

@@ -808,7 +808,11 @@ def add_to_package(package_uid, resource, codebase):
     Append `package_uid` to `resource.for_packages`, if the attribute exists and
     `package_uid` is not already in `resource.for_packages`.
     """
-    if hasattr(resource, 'for_packages') and isinstance(resource.for_packages, list):
+    if (
+        hasattr(resource, 'for_packages')
+        and isinstance(resource.for_packages, list)
+        and package_uid
+    ):
         if package_uid in resource.for_packages:
             return
         resource.for_packages.append(package_uid)
@@ -1113,16 +1117,21 @@ def assemble_from_many(cls, pkgdata_resources, codebase, package_adder=add_to_pa
                 package.license_expression = cls.compute_normalized_license(package)
             yield package
         yield from dependencies
-        yield from resources
 
-        # Associate Package to Resources once they have been yielded
+        # Associate Package to Resources and yield them
+        for resource in resources:
+            package_adder(package_uid, resource, codebase)
+            yield resource
+
         for package_uid, resource in resources_from_package:
             package_adder(package_uid, resource, codebase)
+            yield resource
 
         # the whole parent subtree of the base_resource is for this package
         if package_uid:
             for res in base_resource.walk(codebase):
                 package_adder(package_uid, res, codebase)
+                yield res
 
     @classmethod
     def assemble_from_many_datafiles(

src/packagedcode/rpm.py

@@ -201,7 +201,6 @@ def assemble(cls, package_data, resource, codebase, package_adder):
                 if package_uid:
                     # path is found and processed: remove it, so we can check if we
                     # found all of them
-                    package_adder(package_uid, res, codebase)
                     resources.append(res)
 
         # if we have left over file references, add these to extra data
@@ -224,7 +223,9 @@ def assemble(cls, package_data, resource, codebase, package_adder):
                     dep.namespace = namespace
                 yield dep
 
-        yield from resources
+        for resource in resources:
+            package_adder(package_uid, resource, codebase)
+            yield resource
 
 
 # TODO: add dependencies!!!