fix the error

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

Author: dd-jy

src/fosslight_scanner/_run_compare.py

@@ -193,6 +193,7 @@ def write_compared_result(output_file, compared_result, file_ext, before_yaml=''
 
     return success, output_file
 
+
 def get_comparison_result_filename(output_path, output_file, output_extension, _start_time):
     result_file = ""
     if output_file != "":

src/fosslight_scanner/cli.py

@@ -13,7 +13,8 @@ def main():
     parser.add_argument('mode', nargs='?', help='source| dependency| binary| reuse| all| compare', default="all")
     parser.add_argument('--path', '-p', help='Path to analyze', type=str, dest='path', default="")
     parser.add_argument('--wget', '-w', help='Link to be analyzed', type=str, dest='link', default="")
-    parser.add_argument('--file', '-f', help='Output file format (excel, yaml), Compare mode (excel, html, yaml, json)', type=str, dest='file', default="")
+    parser.add_argument('--file', '-f', help='Scanner output file format (excel,yaml), Compare mode (excel,html,yaml,json)',
+                        type=str, dest='file', default="")
     parser.add_argument('--output', '-o', help='Output directory or file', type=str, dest='output', default="")
     parser.add_argument('--dependency', '-d', help='Dependency arguments', type=str, dest='dep_argument', default="")
     parser.add_argument('--url', '-u', help="DB Url", type=str, dest='db_url', default="")

src/fosslight_scanner/fosslight_scanner.py

@@ -189,13 +189,12 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
         if remove_src_data:
             overwrite_excel(_output_dir, default_oss_name, "OSS Name")
             overwrite_excel(_output_dir, url, "Download Location")
-        success, output_files = merge_excels(_output_dir, final_report)
+        success, err_msg = merge_excels(_output_dir, final_report)
 
-        if success and output_files:
-            temp_output_fiiles.extend(output_files.split(","))
-            result_log["Output File"] = temp_output_fiiles
+        if success:
+            result_log["Output File"] = final_report
         else:
-            logger.error(f"Fail to generate a result file. : {output_files}")
+            logger.error(f"Fail to generate a result file({final_report}): {err_msg}")
 
         _str_final_result_log = yaml.safe_dump(result_log, allow_unicode=True, sort_keys=True)
         logger.info(_str_final_result_log)
@@ -275,7 +274,8 @@ def run_main(mode, src_path, dep_arguments, output_file_or_dir, file_format, url
     if mode == "compare":
         CUSTOMIZED_FORMAT = {'excel': '.xlsx', 'html': '.html', 'json': '.json', 'yaml': '.yaml'}
 
-    success, msg, output_path, output_file, output_extension = check_output_format(output_file_or_dir, file_format, CUSTOMIZED_FORMAT)
+    success, msg, output_path, output_file, output_extension = check_output_format(output_file_or_dir, file_format,
+                                                                                   CUSTOMIZED_FORMAT)
     if not success:
         logger.error(msg)
         sys.exit(1)

tox.ini

@@ -36,6 +36,6 @@ deps =
 
 commands =
     fosslight -h
-    fosslight all -o test_result_local_path/test.csv -p tests -r
+    fosslight all -o test_result_local_path/test.xlsx -p tests -r
     fosslight source -o test_result_wget -w "https://github.com/LGE-OSS/example.git"
     pytest -v --flake8