Fix to run correct mode only xlsx

Signed-off-by: Jiyeong Seok <[email protected]>

Author: dd-jy

requirements.txt

@@ -1,12 +1,12 @@
-fosslight_source
 future
 pandas
 xlrd
 openpyxl
 progress
 pyyaml
 beautifulsoup4
-fosslight_util>=1.4.16
+fosslight_util>=1.4.25
+fosslight_source>=1.6.28
 fosslight_dependency>=3.7.4
-fosslight_binary>=4.0.7
+fosslight_binary>=4.1.24
 fosslight_prechecker>=3.0.1

src/fosslight_scanner/_help.py

@@ -34,6 +34,7 @@
             -t\t\t\t    Hide the progress bar
             -v\t\t\t    Print FOSSLight Scanner version
             --no_correction\t    Enter if you don't want to correct OSS information with sbom-info.yaml
+                                     * Correction mode only supported xlsx format.
             --correct_fpath <path>  Path to the sbom-info.yaml file
 
         Options for only 'all' or 'bin' mode

src/fosslight_scanner/common.py

@@ -302,6 +302,8 @@ def check_exclude_dir(oss_list):
     _exclude_dirs = ["venv", "node_modules", "Pods", "Carthage"]
 
     for oss_item in oss_list:
+        if not oss_item.source_name_or_path:
+            continue
         for exclude_dir in _exclude_dirs:
             if exclude_dir in oss_item.source_name_or_path[0].split(os.path.sep):
                 oss_item.exclude = True

src/fosslight_scanner/fosslight_scanner.py

@@ -191,36 +191,39 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
     try:
         output_file_without_ext = os.path.join(final_excel_dir, output_file)
         final_report = f"{output_file_without_ext}{output_extension}"
-        tmp_dir = f"tmp_{datetime.now().strftime('%y%m%d_%H%M')}"
-        exist_src = False
-        exist_bin = False
-        if correct_mode:
-            os.makedirs(os.path.join(_output_dir, tmp_dir), exist_ok=True)
-            if os.path.exists(os.path.join(_output_dir, output_files['SRC'])):
-                exist_src = True
-                shutil.copy2(os.path.join(_output_dir, output_files['SRC']), os.path.join(_output_dir, tmp_dir))
-            if os.path.exists(os.path.join(_output_dir, output_files['BIN'])):
-                exist_bin = True
-                shutil.copy2(os.path.join(_output_dir, output_files['BIN']), os.path.join(_output_dir, tmp_dir))
-            if exist_src or exist_bin:
-                correct_scanner_result(_output_dir, output_files, output_extension, exist_src, exist_bin)
+
         if output_extension == ".xlsx":
+            tmp_dir = f"tmp_{datetime.now().strftime('%y%m%d_%H%M')}"
+            exist_src = False
+            exist_bin = False
+            if correct_mode:
+                os.makedirs(os.path.join(_output_dir, tmp_dir), exist_ok=True)
+                if os.path.exists(os.path.join(_output_dir, output_files['SRC'])):
+                    exist_src = True
+                    shutil.copy2(os.path.join(_output_dir, output_files['SRC']), os.path.join(_output_dir, tmp_dir))
+                if os.path.exists(os.path.join(_output_dir, output_files['BIN'])):
+                    exist_bin = True
+                    shutil.copy2(os.path.join(_output_dir, output_files['BIN']), os.path.join(_output_dir, tmp_dir))
+                if exist_src or exist_bin:
+                    correct_scanner_result(_output_dir, output_files, output_extension, exist_src, exist_bin)
+
             if remove_src_data:
                 overwrite_excel(_output_dir, default_oss_name, "OSS Name")
                 overwrite_excel(_output_dir, url, "Download Location")
             success, err_msg = merge_excels(_output_dir, final_report)
+
+            if correct_mode:
+                if exist_src:
+                    shutil.move(os.path.join(_output_dir, tmp_dir, output_files['SRC']),
+                                os.path.join(_output_dir, output_files['SRC']))
+                if exist_bin:
+                    shutil.move(os.path.join(_output_dir, tmp_dir, output_files['BIN']),
+                                os.path.join(_output_dir, output_files['BIN']))
+                shutil.rmtree(os.path.join(_output_dir, tmp_dir), ignore_errors=True)
         elif output_extension == ".yaml":
             merge_yaml_files = [output_files["SRC"], output_files["BIN"], output_files["DEP"]]
             success, err_msg = merge_yamls(_output_dir, merge_yaml_files, final_report,
                                            remove_src_data, default_oss_name, url)
-        if correct_mode:
-            if exist_src:
-                shutil.move(os.path.join(_output_dir, tmp_dir, output_files['SRC']),
-                            os.path.join(_output_dir, output_files['SRC']))
-            if exist_bin:
-                shutil.move(os.path.join(_output_dir, tmp_dir, output_files['BIN']),
-                            os.path.join(_output_dir, output_files['BIN']))
-            shutil.rmtree(os.path.join(_output_dir, tmp_dir), ignore_errors=True)
         if success:
             if os.path.isfile(final_report):
                 result_log["Output File"] = final_report