fosslight-source 2.1.14__py3-none-any.whl → 2.1.16__py3-none-any.whl

fosslight_source/_parsing_scancode_file_item.py

@@ -7,6 +7,7 @@ import os
 import logging
 import re
 import fosslight_util.constant as constant
+from fosslight_util.get_pom_license import get_license_from_pom
 from ._license_matched import MatchedLicense
 from ._scan_item import SourceItem
 from ._scan_item import is_exclude_dir
@@ -192,8 +193,34 @@ def parsing_scancode_32_earlier(scancode_file_list: list, has_error: bool = Fals
                     if len(license_detected) > 0:
                         result_item.licenses = license_detected
 
-                        if is_manifest_file(file_path):
+                        detected_without_pom = []
+                        if is_manifest_file(file_path) and len(license_detected) > 0:
                             result_item.is_manifest_file = True
+                            if file_path.endswith('.pom'):
+                                try:
+                                    pom_licenses = get_license_from_pom(pom_path=file_path, check_parent=False)
+                                    normalize_pom_licenses = []
+                                    if pom_licenses:
+                                        pom_license_list = pom_licenses.split(', ')
+                                        for pom_license in pom_license_list:
+                                            if pom_license not in license_detected:
+                                                for lic_matched_key, lic_info in license_list.items():
+                                                    if hasattr(lic_info, 'matched_text') and lic_info.matched_text:
+                                                        matched_txt = str(lic_info.matched_text).replace(',', '')
+                                                        if pom_license in matched_txt:
+                                                            normalize_pom_licenses.append(lic_info.license)
+                                                            break
+                                            else:
+                                                normalize_pom_licenses.append(pom_license)
+                                    detected_without_pom = list(set(license_detected) - set(normalize_pom_licenses))
+                                    if detected_without_pom:
+                                        result_item.comment = f"Detected: {', '.join(detected_without_pom)}"
+                                        result_item.licenses = []
+                                        result_item.licenses = normalize_pom_licenses
+                                        if not normalize_pom_licenses:
+                                            result_item.exclude = True
+                                except Exception as ex:
+                                    logger.info(f"Failed to extract license from POM {file_path}: {ex}")
 
                         # Remove copyright info for license text file of GPL family
                         if should_remove_copyright_for_gpl_license_text(license_detected, result_item.is_license_text):
@@ -202,7 +229,7 @@ def parsing_scancode_32_earlier(scancode_file_list: list, has_error: bool = Fals
                         else:
                             result_item.copyright = copyright_value_list
 
-                        if len(license_expression_list) > 0:
+                        if len(license_expression_list) > 0 and not detected_without_pom:
                             license_expression_list = list(
                                 set(license_expression_list))
                             result_item.comment = ','.join(license_expression_list)
@@ -307,8 +334,34 @@ def parsing_scancode_32_later(
                 result_item.exclude = is_exclude_file(file_path)
                 result_item.is_license_text = file.get("percentage_of_license_text", 0) > 90 or is_notice_file(file_path)
 
+                detected_without_pom = []
                 if is_manifest_file(file_path) and len(license_detected) > 0:
                     result_item.is_manifest_file = True
+                    if file_path.endswith('.pom'):
+                        try:
+                            pom_licenses = get_license_from_pom(pom_path=file_path, check_parent=False)
+                            normalize_pom_licenses = []
+                            if pom_licenses:
+                                pom_license_list = pom_licenses.split(', ')
+                                for pom_license in pom_license_list:
+                                    if pom_license not in license_detected:
+                                        for lic_matched_key, lic_info in license_list.items():
+                                            if hasattr(lic_info, 'matched_text') and lic_info.matched_text:
+                                                matched_txt = str(lic_info.matched_text).replace(',', '')
+                                                if pom_license in matched_txt:
+                                                    normalize_pom_licenses.append(lic_info.license)
+                                                    break
+                                    else:
+                                        normalize_pom_licenses.append(pom_license)
+                            detected_without_pom = list(set(license_detected) - set(normalize_pom_licenses))
+                            if detected_without_pom:
+                                result_item.comment = f"Detected: {', '.join(detected_without_pom)}"
+                                result_item.licenses = []
+                                result_item.licenses = normalize_pom_licenses
+                                if not normalize_pom_licenses:
+                                    result_item.exclude = True
+                        except Exception as ex:
+                            logger.info(f"Failed to extract license from POM {file_path}: {ex}")
 
                 # Remove copyright info for license text file of GPL family
                 if should_remove_copyright_for_gpl_license_text(license_detected, result_item.is_license_text):
@@ -317,7 +370,7 @@ def parsing_scancode_32_later(
                 else:
                     result_item.copyright = copyright_value_list
 
-                if len(license_detected) > 1:
+                if len(license_detected) > 1 and not detected_without_pom:
                     license_expression_spdx = file.get("detected_license_expression_spdx", "")
                     license_expression = file.get("detected_license_expression", "")
                     if license_expression_spdx:

fosslight_source/_scan_item.py

@@ -74,6 +74,8 @@ class SourceItem(FileItem):
                             break
             if max_length_exceed and (SUBSTRING_LICENSE_COMMENT not in self.comment):
                 self.comment = f"{self.comment}/ {SUBSTRING_LICENSE_COMMENT}" if self.comment else SUBSTRING_LICENSE_COMMENT
+        else:
+            self._licenses = value
 
     def set_oss_item(self) -> None:
         self.oss_items = []
@@ -151,10 +153,13 @@ def is_manifest_file(file_path: str) -> bool:
 
 
 def is_package_dir(dir_path: str) -> bool:
-    path_parts = dir_path.split(os.path.sep)
+    # scancode and scanoss use '/' as path separator regardless of OS
+    dir_path = dir_path.replace('\\', '/')
+    path_parts = dir_path.split('/')
+
     for pkg_dir in _package_directory:
         if pkg_dir in path_parts:
             pkg_index = path_parts.index(pkg_dir)
-            pkg_path = os.path.sep.join(path_parts[:pkg_index + 1])
+            pkg_path = '/'.join(path_parts[:pkg_index + 1])
             return True, pkg_path
     return False, ""

{fosslight_source-2.1.14.dist-info → fosslight_source-2.1.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
-Name: fosslight-source
-Version: 2.1.14
+Metadata-Version: 2.4
+Name: fosslight_source
+Version: 2.1.16
 Summary: FOSSLight Source Scanner
 Home-page: https://github.com/fosslight/fosslight_source_scanner
 Download-URL: https://github.com/fosslight/fosslight_source_scanner
@@ -17,15 +17,26 @@ License-File: LICENSE
 Requires-Dist: pyparsing
 Requires-Dist: scanoss>=1.18.0
 Requires-Dist: XlsxWriter
-Requires-Dist: fosslight-util>=2.1.10
+Requires-Dist: fosslight_util>=2.1.30
 Requires-Dist: PyYAML
 Requires-Dist: wheel>=0.38.1
 Requires-Dist: intbitset
-Requires-Dist: fosslight-binary>=5.0.0
+Requires-Dist: fosslight_binary>=5.0.0
 Requires-Dist: scancode-toolkit>=32.0.2
 Requires-Dist: fingerprints==1.2.3
 Requires-Dist: normality==2.6.1
 Requires-Dist: click==8.2.1
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <!--
 Copyright (c) 2021 LG Electronics

{fosslight_source-2.1.14.dist-info → fosslight_source-2.1.16.dist-info}/RECORD

@@ -1,16 +1,16 @@
 fosslight_source/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fosslight_source/_help.py,sha256=q3eKABhBrz8hvWSvmLVszStNpL18TCYLnUuefaU4V-M,2013
 fosslight_source/_license_matched.py,sha256=-3H881XQjFDafRttBsuboS3VbCPYEvPH1pwWXptknE4,2164
-fosslight_source/_parsing_scancode_file_item.py,sha256=Nok9bZRH2oBCORb4LTx0skGLxpw_u4fNmvaVL5YheQw,16089
+fosslight_source/_parsing_scancode_file_item.py,sha256=DA2tEbjCHXFLfavCh0TjRIF1-dE4Ep7X2ivDF8IJqS8,20227
 fosslight_source/_parsing_scanoss_file.py,sha256=0f5JzjnFU-kcPZRX7OKnextyvANjKwwNZeyCJVC7eME,4624
-fosslight_source/_scan_item.py,sha256=6cMAvE0Q2nnW2XwUt4xezXp_NmXzZsmjUqe78zoSTlU,6437
+fosslight_source/_scan_item.py,sha256=9bm1kOeBudIb2M8wmmRKAzOFdkdBTUtoyO2LQKaJeDQ,6584
 fosslight_source/cli.py,sha256=2TuHZvDKUp8R12DM9gesTF23RT7OBw968AdzNLtVanU,16650
 fosslight_source/run_scancode.py,sha256=YSzLoS4p-Kge91uQpI4483ZfiapF-3umgJHggxKtiuU,7220
 fosslight_source/run_scanoss.py,sha256=8wu3sa-YBqjfb5x2dbDJuAdw3rrExueOW23WdzqDCaU,5721
 fosslight_source/run_spdx_extractor.py,sha256=Hr9sTv06cJaVITy8amwexIW2FV8_rUcFw6hKmR9ZYws,1990
-fosslight_source-2.1.14.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_source-2.1.14.dist-info/METADATA,sha256=MYuoJrNT94A3i6M_pAvQkIrb3dUI8Ztx1ebAgcIKliU,3322
-fosslight_source-2.1.14.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-fosslight_source-2.1.14.dist-info/entry_points.txt,sha256=G4bBRWqSrJ68g-2M-JtNDrSZsdym_M7_KohQ2qR1vG8,113
-fosslight_source-2.1.14.dist-info/top_level.txt,sha256=C2vw-0OIent84Vq-UEk1gt_kK1EL8dIItzBzp3WNyA4,17
-fosslight_source-2.1.14.dist-info/RECORD,,
+fosslight_source-2.1.16.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_source-2.1.16.dist-info/METADATA,sha256=tUk55VzoNMOBArqLGuZoHyCoY4IXCqmIoqY2NvX1344,3558
+fosslight_source-2.1.16.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+fosslight_source-2.1.16.dist-info/entry_points.txt,sha256=G4bBRWqSrJ68g-2M-JtNDrSZsdym_M7_KohQ2qR1vG8,113
+fosslight_source-2.1.16.dist-info/top_level.txt,sha256=C2vw-0OIent84Vq-UEk1gt_kK1EL8dIItzBzp3WNyA4,17
+fosslight_source-2.1.16.dist-info/RECORD,,

{fosslight_source-2.1.14.dist-info → fosslight_source-2.1.16.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.45.1)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any