fosslight-source 2.1.11__tar.gz → 2.1.13__tar.gz

{fosslight_source-2.1.11 → fosslight_source-2.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_source
-Version: 2.1.11
+Version: 2.1.13
 Summary: FOSSLight Source Scanner
 Home-page: https://github.com/fosslight/fosslight_source_scanner
 Download-URL: https://github.com/fosslight/fosslight_source_scanner

{fosslight_source-2.1.11 → fosslight_source-2.1.13}/requirements.txt

@@ -6,4 +6,6 @@ PyYAML
 wheel>=0.38.1
 intbitset
 fosslight_binary>=5.0.0
-scancode-toolkit
+scancode-toolkit>=32.0.2
+fingerprints==1.2.3
+normality==2.6.1

{fosslight_source-2.1.11 → fosslight_source-2.1.13}/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.11',
+        version='2.1.13',
         package_dir={"": "src"},
         packages=find_packages(where='src'),
         description='FOSSLight Source Scanner',

{fosslight_source-2.1.11 → fosslight_source-2.1.13}/src/fosslight_source/_parsing_scancode_file_item.py

@@ -14,6 +14,7 @@ from ._scan_item import is_exclude_file
 from ._scan_item import replace_word
 from ._scan_item import is_notice_file
 from ._scan_item import is_manifest_file
+from ._scan_item import is_package_dir
 from typing import Tuple
 
 logger = logging.getLogger(constant.LOGGER_NAME)
@@ -99,6 +100,13 @@ def parsing_scancode_32_earlier(scancode_file_list: list, has_error: bool = Fals
                     copyright_list = file.get("copyrights", [])
 
                     result_item = SourceItem(file_path)
+                    is_pkg, pkg_path = is_package_dir(os.path.dirname(file_path))
+                    if is_pkg:
+                        result_item.source_name_or_path = pkg_path
+                        if not any(x.source_name_or_path == result_item.source_name_or_path for x in scancode_file_item):
+                            result_item.exclude = True
+                            scancode_file_item.append(result_item)
+                        continue
 
                     if has_error and "scan_errors" in file:
                         error_msg = file.get("scan_errors", [])
@@ -185,7 +193,7 @@ def parsing_scancode_32_earlier(scancode_file_list: list, has_error: bool = Fals
                         result_item.licenses = license_detected
 
                         if is_manifest_file(file_path):
-                            result_item.is_license_text = True
+                            result_item.is_manifest_file = True
 
                         # 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):
@@ -235,6 +243,13 @@ def parsing_scancode_32_later(
                     continue
 
                 result_item = SourceItem(file_path)
+                is_pkg, pkg_path = is_package_dir(os.path.dirname(file_path))
+                if is_pkg:
+                    result_item.source_name_or_path = pkg_path
+                    if not any(x.source_name_or_path == result_item.source_name_or_path for x in scancode_file_item):
+                        result_item.exclude = True
+                        scancode_file_item.append(result_item)
+                    continue
 
                 if has_error:
                     error_msg = file.get("scan_errors", [])
@@ -293,7 +308,7 @@ def parsing_scancode_32_later(
                 result_item.is_license_text = file.get("percentage_of_license_text", 0) > 90 or is_notice_file(file_path)
 
                 if is_manifest_file(file_path) and len(license_detected) > 0:
-                    result_item.is_license_text = True
+                    result_item.is_manifest_file = True
 
                 # 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):

{fosslight_source-2.1.11 → fosslight_source-2.1.13}/src/fosslight_source/_parsing_scanoss_file.py

@@ -8,6 +8,7 @@ import logging
 import fosslight_util.constant as constant
 from ._scan_item import SourceItem
 from ._scan_item import is_exclude_file
+from ._scan_item import is_package_dir
 from ._scan_item import replace_word
 from typing import Tuple
 
@@ -45,6 +46,13 @@ def parsing_scanResult(scanoss_report: dict, path_to_scan: str = "", path_to_exc
         if any(os.path.commonpath([abs_file_path, exclude_path]) == exclude_path for exclude_path in abs_path_to_exclude):
             continue
         result_item = SourceItem(file_path)
+        is_pkg, pkg_path = is_package_dir(os.path.dirname(file_path))
+        if is_pkg:
+            result_item.source_name_or_path = pkg_path
+            if not any(x.source_name_or_path == result_item.source_name_or_path for x in scanoss_file_item):
+                result_item.exclude = True
+                scanoss_file_item.append(result_item)
+            continue
 
         if 'id' in findings[0]:
             if "none" == findings[0]['id']:

{fosslight_source-2.1.11 → fosslight_source-2.1.13}/src/fosslight_source/_scan_item.py

@@ -22,6 +22,7 @@ _exclude_directory = ["test", "tests", "doc", "docs"]
 _exclude_directory = [os.path.sep + dir_name +
                       os.path.sep for dir_name in _exclude_directory]
 _exclude_directory.append("/.")
+_package_directory = ["node_modules", "venv", "Pods", "Carthage"]
 MAX_LICENSE_LENGTH = 200
 MAX_LICENSE_TOTAL_LENGTH = 600
 SUBSTRING_LICENSE_COMMENT = "Maximum character limit (License)"
@@ -33,6 +34,7 @@ class SourceItem(FileItem):
         super().__init__("")
         self.source_name_or_path = value
         self.is_license_text = False
+        self.is_manifest_file = False
         self.license_reference = ""
         self.scanoss_reference = {}
         self.matched_lines = ""  # Only for SCANOSS results
@@ -146,3 +148,13 @@ def is_manifest_file(file_path: str) -> bool:
     pattern = r"({})$".format("|".join(_manifest_filename))
     filename = os.path.basename(file_path)
     return bool(re.match(pattern, filename, re.IGNORECASE))
+
+
+def is_package_dir(dir_path: str) -> bool:
+    path_parts = dir_path.split(os.path.sep)
+    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])
+            return True, pkg_path
+    return False, ""

{fosslight_source-2.1.11 → fosslight_source-2.1.13}/src/fosslight_source/run_scancode.py

@@ -127,6 +127,8 @@ def run_scan(
                                 result_list, key=lambda row: (''.join(row.licenses)))
 
                             for scan_item in result_list:
+                                if os.path.isdir(scan_item.source_name_or_path):
+                                    continue
                                 if check_binary(os.path.join(path_to_scan, scan_item.source_name_or_path)):
                                     scan_item.exclude = True
             except Exception as ex:

{fosslight_source-2.1.11 → fosslight_source-2.1.13}/src/fosslight_source.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-source
-Version: 2.1.11
+Version: 2.1.13
 Summary: FOSSLight Source Scanner
 Home-page: https://github.com/fosslight/fosslight_source_scanner
 Download-URL: https://github.com/fosslight/fosslight_source_scanner

{fosslight_source-2.1.11 → fosslight_source-2.1.13}/src/fosslight_source.egg-info/requires.txt

@@ -6,4 +6,6 @@ PyYAML
 wheel>=0.38.1
 intbitset
 fosslight_binary>=5.0.0
-scancode-toolkit
+scancode-toolkit>=32.0.2
+fingerprints==1.2.3
+normality==2.6.1