Disable license detection in process_codebase

This commit disables license detection on files happening when the
license CLI option is disabled for a package scan.

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

Author: AyanSinhaMahapatra

src/packagedcode/licensing.py

@@ -56,7 +56,7 @@ def logger_debug(*args):
         return logger.debug(' '.join(isinstance(a, str) and a or repr(a) for a in args))
 
 
-def add_referenced_license_matches_for_package(resource, codebase, no_licenses):
+def add_referenced_license_matches_for_package(resource, codebase):
     """
     Return an updated ``resource`` saving it in place, after adding new license
     detections to the package manifests detected in this resource, following their
@@ -106,13 +106,7 @@ def add_referenced_license_matches_for_package(resource, codebase, no_licenses):
                 if not referenced_resource:
                     continue
 
-                if no_licenses:
-                    referenced_license_detections = get_license_detection_mappings(
-                        location=referenced_resource.location
-                    )
-
-                else:
-                    referenced_license_detections = referenced_resource.license_detections
+                referenced_license_detections = referenced_resource.license_detections
 
                 if referenced_license_detections:
                     modified = True
@@ -160,7 +154,7 @@ def add_referenced_license_matches_for_package(resource, codebase, no_licenses):
             yield resource
 
 
-def add_referenced_license_detection_from_package(resource, codebase, no_licenses):
+def add_referenced_license_detection_from_package(resource, codebase):
     """
     Return an updated ``resource`` saving it in place, after adding new license
     matches (licenses and license_expressions) following their Rule
@@ -209,7 +203,6 @@ def add_referenced_license_detection_from_package(resource, codebase, no_license
             sibling_license_detections, _le = get_license_detections_from_sibling_file(
                 resource=root_resource,
                 codebase=codebase,
-                no_licenses=no_licenses,
             )
             if TRACE:
                 logger_debug(
@@ -278,12 +271,10 @@ def add_referenced_license_detection_from_package(resource, codebase, no_license
         yield resource
 
 
-def add_license_from_sibling_file(resource, codebase, no_licenses):
+def add_license_from_sibling_file(resource, codebase):
     """
     Given a resource and it's codebase object, assign licenses to the package
     detections in that resource, from the sibling files of it.
-
-    If `no_license` is True, then license scan (for resources) is disabled.
     """
     if TRACE:
         logger_debug(f'packagedcode.licensing: add_license_from_sibling_file: resource: {resource.path}')
@@ -303,7 +294,6 @@ def add_license_from_sibling_file(resource, codebase, no_licenses):
     license_detections, license_expression = get_license_detections_from_sibling_file(
         resource=resource,
         codebase=codebase,
-        no_licenses=no_licenses,
     )
     if not license_detections:
         return
@@ -333,13 +323,11 @@ def is_legal_or_readme(resource):
     return False
 
 
-def get_license_detections_from_sibling_file(resource, codebase, no_licenses):
+def get_license_detections_from_sibling_file(resource, codebase):
     """
     Return `license_detections`, a list of LicenseDetection objects and a
     `license_expression`, given a resource and it's codebase object, from
     the sibling files of the resource.
-
-    If `no_license` is True, then license scan (for resources) is disabled.
     """
     siblings = []
 
@@ -357,15 +345,7 @@ def get_license_detections_from_sibling_file(resource, codebase, no_licenses):
 
     license_detections = []
     for sibling in siblings:
-        if no_licenses:
-            detections = get_license_detection_mappings(
-                location=sibling.location,
-                analysis=DetectionCategory.PACKAGE_ADD_FROM_SIBLING_FILE.value,
-                post_scan=True,
-            )
-            license_detections.extend(detections)
-        else:
-            license_detections.extend(sibling.license_detections)
+        license_detections.extend(sibling.license_detections)
 
     if not license_detections:
         return [], None

src/packagedcode/plugin_package.py

@@ -194,17 +194,19 @@ def process_codebase(self, codebase, strip_root=False, **kwargs):
         Also perform additional package license detection that depends on either
         file license detection or the package detections.
         """
-        no_licenses = False
+        has_licenses = hasattr(codebase.root, 'license_detections')
 
         # These steps add proper license detections to package_data and hence
         # this is performed before top level packages creation
         for resource in codebase.walk(topdown=False):
-            if not hasattr(resource, 'license_detections'):
-                no_licenses = True
+            if not has_licenses:
+                #TODO: Add the steps where we detect licenses from files for only a package scan
+                # in the multiprocessing get_package_data API function
+                continue
 
             # If we don't detect license in package_data but there is license detected in file
             # we add the license expression from the file to a package
-            modified = add_license_from_file(resource, codebase, no_licenses)
+            modified = add_license_from_file(resource, codebase)
             if TRACE and modified:
                 logger_debug(f'packagedcode: process_codebase: add_license_from_file: modified: {modified}')
 
@@ -213,30 +215,30 @@ def process_codebase(self, codebase, strip_root=False, **kwargs):
 
             # If there is referenced files in a extracted license statement, we follow
             # the references, look for license detections and add them back
-            modified = list(add_referenced_license_matches_for_package(resource, codebase, no_licenses))
+            modified = list(add_referenced_license_matches_for_package(resource, codebase))
             if TRACE and modified:
                 logger_debug(f'packagedcode: process_codebase: add_referenced_license_matches_for_package: modified: {modified}')
 
             # If there is a LICENSE file on the same level as the manifest, and no license
             # is detected in the package_data, we add the license from the file
-            modified = add_license_from_sibling_file(resource, codebase, no_licenses)
+            modified = add_license_from_sibling_file(resource, codebase)
             if TRACE and modified:
                 logger_debug(f'packagedcode: process_codebase: add_license_from_sibling_file: modified: {modified}')
 
         # Create codebase-level packages and dependencies
         create_package_and_deps(codebase, strip_root=strip_root, **kwargs)
 
-        if not no_licenses:
+        if has_licenses:
             # This step is dependent on top level packages
             for resource in codebase.walk(topdown=False):
                 # If there is a unknown reference to a package we add the license
                 # from the package license detection
-                modified = list(add_referenced_license_detection_from_package(resource, codebase, no_licenses))
+                modified = list(add_referenced_license_detection_from_package(resource, codebase))
                 if TRACE and modified:
                     logger_debug(f'packagedcode: process_codebase: add_referenced_license_matches_from_package: modified: {modified}')
 
 
-def add_license_from_file(resource, codebase, no_licenses):
+def add_license_from_file(resource, codebase):
     """
     Given a Resource, check if the detected package_data doesn't have license detections
     and the file has license detections, and if so, populate the package_data license
@@ -248,10 +250,7 @@ def add_license_from_file(resource, codebase, no_licenses):
     if not resource.is_file:
         return
 
-    if no_licenses:
-        license_detections_file = get_license_detection_mappings(location=resource.location)
-    else:
-        license_detections_file = resource.license_detections
+    license_detections_file = resource.license_detections
 
     if TRACE:
         logger_debug(f'add_license_from_file: license_detections_file: {license_detections_file}')