fosslight-scanner 2.1.8__py3-none-any.whl → 2.1.9__py3-none-any.whl

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

fosslight_scanner/fosslight_scanner.py

@@ -25,7 +25,6 @@ from fosslight_util.set_log import init_log
 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

{fosslight_scanner-2.1.8.dist-info → fosslight_scanner-2.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-scanner
-Version: 2.1.8
+Version: 2.1.9
 Summary: FOSSLight Scanner
 Home-page: https://github.com/fosslight/fosslight_scanner
 Download-URL: https://github.com/fosslight/fosslight_scanner
@@ -21,9 +21,9 @@ Requires-Dist: progress
 Requires-Dist: pyyaml
 Requires-Dist: beautifulsoup4
 Requires-Dist: fosslight-util<3.0.0,>=2.1.12
-Requires-Dist: fosslight-source<3.0.0,>=2.1.4
+Requires-Dist: fosslight-source<3.0.0,>=2.1.12
 Requires-Dist: fosslight-dependency<5.0.0,>=4.1.3
-Requires-Dist: fosslight-binary<6.0.0,>=5.1.2
+Requires-Dist: fosslight-binary<6.0.0,>=5.1.9
 Requires-Dist: fosslight-prechecker<5.0.0,>=4.0.0
 
 <!--

{fosslight_scanner-2.1.8.dist-info → fosslight_scanner-2.1.9.dist-info}/RECORD

@@ -4,12 +4,12 @@ fosslight_scanner/_help.py,sha256=-Dqgn1inH26614GjrIe8I5cdEziuAxTtwrUdtTkrpjQ,30
 fosslight_scanner/_parse_setting.py,sha256=SoIEoPGlFXAp6__eEFEMIPYPoKLvmqxXF5X_C_uFiVI,2468
 fosslight_scanner/_run_compare.py,sha256=zmzX-FIvWCSkwPvEA3iHfVpyg6QDGUCpw3tJuGLdPWM,10657
 fosslight_scanner/cli.py,sha256=C4YNPVJJ-Ezj_6xe8k9QbIrf5V44GXbHWCGzR2FMcV8,6547
-fosslight_scanner/common.py,sha256=0LgXlGOJVB0kDeZ-1VeHEErArh7TgXkwEAmYAL9q93I,8465
-fosslight_scanner/fosslight_scanner.py,sha256=MIjKJ_HHyKKlh3HhuTtuezxTmX9guDWYDgjdXZP3IPU,21001
+fosslight_scanner/common.py,sha256=FyEoqVsIZ4pRIlHRXZES8PYaYfy3PEmUaOn02YSuuYU,8377
+fosslight_scanner/fosslight_scanner.py,sha256=TLMzzXjjPFAzrdS50ruqADKF8Shkf429O2BQeinkxPM,20930
 fosslight_scanner/resources/bom_compare.html,sha256=VocJ9bDmQQOwfGyvXatPZ4W-QddO-IlsAvKdO0nZ7pA,2240
-fosslight_scanner-2.1.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_scanner-2.1.8.dist-info/METADATA,sha256=Ee5RYpuVUGR4ra07tmUcq8_6U14jF0AL1FuJWJFwJJ0,7821
-fosslight_scanner-2.1.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-fosslight_scanner-2.1.8.dist-info/entry_points.txt,sha256=dl7AA0_Jqnq0NHuCEaxcJFgstLw3sod_-FGtcgZuJbs,104
-fosslight_scanner-2.1.8.dist-info/top_level.txt,sha256=43_xLb5KYpy8wOU1H2Wd2fEsWBY7Dg6ZEJJXkfT64Ak,18
-fosslight_scanner-2.1.8.dist-info/RECORD,,
+fosslight_scanner-2.1.9.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_scanner-2.1.9.dist-info/METADATA,sha256=y1f4kwBG6-smcAnnPVzKL_fAktgLYh_XwRftcFvBMMw,7822
+fosslight_scanner-2.1.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+fosslight_scanner-2.1.9.dist-info/entry_points.txt,sha256=dl7AA0_Jqnq0NHuCEaxcJFgstLw3sod_-FGtcgZuJbs,104
+fosslight_scanner-2.1.9.dist-info/top_level.txt,sha256=43_xLb5KYpy8wOU1H2Wd2fEsWBY7Dg6ZEJJXkfT64Ak,18
+fosslight_scanner-2.1.9.dist-info/RECORD,,