fosslight-scanner 2.1.3__py3-none-any.whl → 2.1.5__py3-none-any.whl

fosslight_scanner/common.py

@@ -116,11 +116,12 @@ def create_scancodejson(all_scan_item_origin, ui_mode_report, src_path=""):
 
     try:
         all_scan_item = copy.deepcopy(all_scan_item_origin)
-        if FOSSLIGHT_DEPENDENCY in all_scan_item.file_items:
-            del all_scan_item.file_items[FOSSLIGHT_DEPENDENCY]
-        first_sheet = FOSSLIGHT_SOURCE
         if all_scan_item.file_items:
-            first_sheet = next(iter(all_scan_item.file_items))
+            first_sheet = next((item for item in all_scan_item.file_items if item != FOSSLIGHT_DEPENDENCY),
+                                None)
+        if not first_sheet:
+            first_sheet = FOSSLIGHT_SOURCE
+            all_scan_item.file_items[first_sheet] = []
         if src_path:
             fileitems_without_oss = []
             for root, _, files in os.walk(src_path):

fosslight_scanner/fosslight_scanner.py

@@ -52,7 +52,7 @@ _start_time = ""
 _executed_path = ""
 SRC_DIR_FROM_LINK_PREFIX = "fosslight_src_dir_"
 SCANNER_MODE = [
-    "all", "compare", "reuse", "prechecker", "binary",
+    "all", "compare", "binary",
     "bin", "src", "source", "dependency", "dep"
 ]
 
@@ -183,12 +183,6 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
         abs_path = os.path.abspath(src_path)
 
         if success:
-            if run_prechecker:
-                success, result = call_analysis_api(src_path, "Prechecker Lint",
-                                                    -1, prechecker_lint,
-                                                    abs_path, False, _output_dir,
-                                                    exclude_path=path_to_exclude)
-
             if run_src:
                 try:
                     if fosslight_source_installed:
@@ -446,12 +440,7 @@ def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format
                 run_src = True
                 run_bin = True
                 run_dep = True
-                run_prechecker = False
-                if "prechecker" in mode_list or "reuse" in mode_list:
-                    run_prechecker = True
             else:
-                if "prechecker" in mode_list or "reuse" in mode_list:
-                    run_prechecker = True
                 if "binary" in mode_list or "bin" in mode_list:
                     run_bin = True
                 if "source" in mode_list or "src" in mode_list:
@@ -459,7 +448,7 @@ def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format
                 if "dependency" in mode_list or "dep" in mode_list:
                     run_dep = True
 
-            if run_dep or run_src or run_bin or run_prechecker:
+            if run_dep or run_src or run_bin:
                 if src_path == "" and url_to_analyze == "":
                     src_path, dep_arguments, url_to_analyze = get_input_mode(_executed_path, mode_list)
 

{fosslight_scanner-2.1.3.dist-info → fosslight_scanner-2.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-scanner
-Version: 2.1.3
+Version: 2.1.5
 Summary: FOSSLight Scanner
 Home-page: https://github.com/fosslight/fosslight_scanner
 Author: LG Electronics
@@ -21,7 +21,7 @@ Requires-Dist: openpyxl
 Requires-Dist: progress
 Requires-Dist: pyyaml
 Requires-Dist: beautifulsoup4
-Requires-Dist: fosslight-util<3.0.0,>=2.1.6
+Requires-Dist: fosslight-util<3.0.0,>=2.1.12
 Requires-Dist: fosslight-source<3.0.0,>=2.1.4
 Requires-Dist: fosslight-dependency<5.0.0,>=4.1.3
 Requires-Dist: fosslight-binary<6.0.0,>=5.1.2

{fosslight_scanner-2.1.3.dist-info → fosslight_scanner-2.1.5.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=FCOpwBt22zpQnT2gcRxiUL2GyWK78i4hVY3m2B0WGw0,8312
-fosslight_scanner/fosslight_scanner.py,sha256=_E-RREMBQt46VkxQdnFUW7beGlJw7lPHV7VdoLITSd8,21495
+fosslight_scanner/common.py,sha256=K7lCp1ysKzmdHIBQZzLCIGiOg1ENbBZo9mZ724rMbPY,8358
+fosslight_scanner/fosslight_scanner.py,sha256=EftUvIHIzWm6yOOGyPFCRV_IkT-2YFcoKSDrVEIea2I,20841
 fosslight_scanner/resources/bom_compare.html,sha256=VocJ9bDmQQOwfGyvXatPZ4W-QddO-IlsAvKdO0nZ7pA,2240
-fosslight_scanner-2.1.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_scanner-2.1.3.dist-info/METADATA,sha256=LOcCWbEAZ4BI4Jyv-1HNPd_d_gK-SU5AcM5Scopligw,7872
-fosslight_scanner-2.1.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-fosslight_scanner-2.1.3.dist-info/entry_points.txt,sha256=0tBUtN9pKtAkuohQuhbzuohdHbeoI0-w95aWAR7J_RU,105
-fosslight_scanner-2.1.3.dist-info/top_level.txt,sha256=43_xLb5KYpy8wOU1H2Wd2fEsWBY7Dg6ZEJJXkfT64Ak,18
-fosslight_scanner-2.1.3.dist-info/RECORD,,
+fosslight_scanner-2.1.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_scanner-2.1.5.dist-info/METADATA,sha256=zYAaQtJeI4-BZ7Gm1FUsNEfFTvZxrbK9vW6V49fqZUg,7873
+fosslight_scanner-2.1.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+fosslight_scanner-2.1.5.dist-info/entry_points.txt,sha256=0tBUtN9pKtAkuohQuhbzuohdHbeoI0-w95aWAR7J_RU,105
+fosslight_scanner-2.1.5.dist-info/top_level.txt,sha256=43_xLb5KYpy8wOU1H2Wd2fEsWBY7Dg6ZEJJXkfT64Ak,18
+fosslight_scanner-2.1.5.dist-info/RECORD,,