Merge pull request #145 from fosslight/skip_pkg_dir

Skip merge if path includes package dir

Author: dd-jy

requirements.txt

@@ -5,7 +5,7 @@ progress
 pyyaml
 beautifulsoup4
 fosslight_util>=2.1.12,<3.0.0
-fosslight_source>=2.1.4,<3.0.0
+fosslight_source>=2.1.12,<3.0.0
 fosslight_dependency>=4.1.3,<5.0.0
-fosslight_binary>=5.1.2,<6.0.0
+fosslight_binary>=5.1.9,<6.0.0
 fosslight_prechecker>=4.0.0,<5.0.0

src/fosslight_scanner/common.py

@@ -168,10 +168,12 @@ def correct_scanner_result(all_scan_item):
         try:
             remove_src_idx_list = []
             for idx_src, src_fileitem in enumerate(src_fileitems):
-                src_fileitem.exclude = check_exclude_dir(src_fileitem.source_name_or_path, src_fileitem.exclude)
+                if check_package_dir(src_fileitem.source_name_or_path):
+                    continue
                 dup_flag = False
                 for bin_fileitem in bin_fileitems:
-                    bin_fileitem.exclude = check_exclude_dir(bin_fileitem.source_name_or_path, bin_fileitem.exclude)
+                    if check_package_dir(bin_fileitem.source_name_or_path):
+                        continue
                     if src_fileitem.source_name_or_path == bin_fileitem.source_name_or_path:
                         dup_flag = True
                         src_all_licenses_non_empty = all(oss_item.license for oss_item in src_fileitem.oss_items)
@@ -202,14 +204,12 @@ def correct_scanner_result(all_scan_item):
     return all_scan_item
 
 
-def check_exclude_dir(source_name_or_path, file_item_exclude):
-    if file_item_exclude:
-        return True
-    _exclude_dirs = ["venv", "node_modules", "Pods", "Carthage"]
-    exclude = False
+def check_package_dir(source_name_or_path):
+    _package_dirs = ["venv", "node_modules", "Pods", "Carthage"]
+    is_pkg = False
 
-    for exclude_dir in _exclude_dirs:
-        if exclude_dir in source_name_or_path.split(os.path.sep):
-            exclude = True
+    for package_dir in _package_dirs:
+        if package_dir in source_name_or_path.split(os.path.sep):
+            is_pkg = True
             break
-    return exclude
+    return is_pkg

src/fosslight_scanner/fosslight_scanner.py

@@ -25,7 +25,6 @@
 from fosslight_util.timer_thread import TimerThread
 import fosslight_util.constant as constant
 from fosslight_util.output_format import check_output_formats_v2
-from fosslight_prechecker._precheck import run_lint as prechecker_lint
 from fosslight_util.cover import CoverItem
 from fosslight_util.oss_item import ScannerItem
 from fosslight_util.output_format import write_output_file

tests/test_common.py

@@ -6,7 +6,7 @@
 
 import os
 import pytest
-from fosslight_scanner.common import copy_file, run_analysis, call_analysis_api, check_exclude_dir, \
+from fosslight_scanner.common import copy_file, run_analysis, call_analysis_api, check_package_dir, \
     create_scancodejson, correct_scanner_result
 
 
@@ -172,24 +172,21 @@ def __init__(self, file_items):
         "FOSSLIGHT_BINARY": [bin_file_item]
     })
 
-    def mock_check_exclude_dir(source_name_or_path, file_item_exclude):
-        return file_item_exclude
-
-    monkeypatch.setattr("fosslight_scanner.common.check_exclude_dir", mock_check_exclude_dir)
     # When
     result = correct_scanner_result(all_scan_item)
     # Then
     assert len(result.file_items["FOSSLIGHT_BINARY"][0].oss_items) == 1
 
 
-@pytest.mark.parametrize("source_name_or_path, file_item_exclude, expected", [
-    ("project/venv/file.py", False, True),
-    ("project/node_modules/file.js", False, True),
-    ("project/Pods/file.m", False, True),
-    ("project/Carthage/file.swift", False, True),
-    ("project/src/file.py", False, False),
-    ("project/src/file.py", True, True),
-    ("project/venv/file.py", True, True),
+@pytest.mark.parametrize("source_name_or_path, expected", [
+    ("project/venv/file.py", True),
+    ("project/node_modules/file.js", True),
+    ("project/Pods/file.m", True),
+    ("project/Carthage/file.swift", True),
+    ("project/src/file.py", False),
+    ("project/venv/file.py", True),
 ])
-def test_check_exclude_dir(source_name_or_path, file_item_exclude, expected):
-    assert check_exclude_dir(source_name_or_path, file_item_exclude) == expected
+def test_check_package_dir(source_name_or_path, expected):
+    result = check_package_dir(source_name_or_path)
+    # Then
+    assert result == expected