fosslight-source 2.1.15__tar.gz → 2.1.17__tar.gz

{fosslight_source-2.1.15/src/fosslight_source.egg-info → fosslight_source-2.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_source
-Version: 2.1.15
+Version: 2.1.17
 Summary: FOSSLight Source Scanner
 Home-page: https://github.com/fosslight/fosslight_source_scanner
 Download-URL: https://github.com/fosslight/fosslight_source_scanner
@@ -17,7 +17,7 @@ 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

{fosslight_source-2.1.15 → fosslight_source-2.1.17}/requirements.txt

@@ -1,7 +1,7 @@
 pyparsing
 scanoss>=1.18.0
 XlsxWriter
-fosslight_util>=2.1.10
+fosslight_util>=2.1.30
 PyYAML
 wheel>=0.38.1
 intbitset

{fosslight_source-2.1.15 → fosslight_source-2.1.17}/setup.py

@@ -14,7 +14,7 @@ with open('requirements.txt', 'r', 'utf-8') as f:
 if __name__ == "__main__":
     setup(
         name='fosslight_source',
-        version='2.1.15',
+        version='2.1.17',
         package_dir={"": "src"},
         packages=find_packages(where='src'),
         description='FOSSLight Source Scanner',

{fosslight_source-2.1.15 → fosslight_source-2.1.17}/src/fosslight_source/_help.py

@@ -3,8 +3,9 @@
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
 from fosslight_util.help import PrintHelpMsg, print_package_version
+from fosslight_util.output_format import SUPPORT_FORMAT
 
-_HELP_MESSAGE_SOURCE_SCANNER = """
+_HELP_MESSAGE_SOURCE_SCANNER = f"""
     FOSSLight Source Scanner Usage: fosslight_source [option1] <arg1> [option2] <arg2>...
 
     FOSSLight Source Scanner uses ScanCode and SCANOSS, the source code scanners, to detect
@@ -20,7 +21,9 @@ _HELP_MESSAGE_SOURCE_SCANNER = """
             -m\t\t\t   Print additional information for scan result on separate sheets
             -e <path>\t\t   Path to exclude from analysis (file and directory)
             -o <output_path>\t   Output path (Path or file name)
-            -f <format>\t\t   Output file formats (excel, csv, opossum, yaml). Multi formats are supported.
+            -f <format>\t\t   Output file formats
+            \t\t\t   ({', '.join(SUPPORT_FORMAT)})
+            \t\t\t   Multiple formats can be specified separated by space.
         Options only for FOSSLight Source Scanner
             -s <scanner>\t   Select which scanner to be run (scancode, scanoss, all)
             -j\t\t\t   Generate raw result of scanners in json format

{fosslight_source-2.1.15 → fosslight_source-2.1.17}/src/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-2.1.15 → fosslight_source-2.1.17}/src/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 = []

{fosslight_source-2.1.15 → fosslight_source-2.1.17/src/fosslight_source.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_source
-Version: 2.1.15
+Version: 2.1.17
 Summary: FOSSLight Source Scanner
 Home-page: https://github.com/fosslight/fosslight_source_scanner
 Download-URL: https://github.com/fosslight/fosslight_source_scanner
@@ -17,7 +17,7 @@ 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

{fosslight_source-2.1.15 → fosslight_source-2.1.17}/src/fosslight_source.egg-info/requires.txt

@@ -1,7 +1,7 @@
 pyparsing
 scanoss>=1.18.0
 XlsxWriter
-fosslight_util>=2.1.10
+fosslight_util>=2.1.30
 PyYAML
 wheel>=0.38.1
 intbitset