Fix the correct mode bug for yaml format

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

Author: dd-jy

src/fosslight_scanner/common.py

@@ -201,15 +201,15 @@ def merge_yamls(_output_dir, merge_yaml_files, final_report, remove_src_data=Fal
     return success, err_msg
 
 
-def correct_scanner_result(_output_dir, output_files, exist_src, exist_bin):
+def correct_scanner_result(_output_dir, output_files, output_extension, exist_src, exist_bin):
     src_oss_list = []
     bin_oss_list = []
     duplicates = False
 
     if exist_src:
-        src_oss_list = check_exclude_dir(get_osslist_with_xlsx(_output_dir, output_files['SRC'], SRC_SHEET))
+        src_oss_list = check_exclude_dir(get_osslist(_output_dir, output_files['SRC'], output_extension, SRC_SHEET))
     if exist_bin:
-        bin_oss_list = check_exclude_dir(get_osslist_with_xlsx(_output_dir, output_files['BIN'], BIN_SHEET))
+        bin_oss_list = check_exclude_dir(get_osslist(_output_dir, output_files['BIN'], output_extension, BIN_SHEET))
 
     if exist_src and exist_bin:
         try:
@@ -250,11 +250,13 @@ def correct_scanner_result(_output_dir, output_files, exist_src, exist_bin):
 
     try:
         if exist_src:
-            success, err_msg = write_xlsx_with_osslist(src_oss_list, _output_dir, output_files['SRC'], SRC_SHEET)
+            success, err_msg = write_output_with_osslist(src_oss_list, _output_dir, output_files['SRC'],
+                                                         output_extension, SRC_SHEET)
             if not success:
                 logger.warning(err_msg)
         if exist_bin:
-            success, err_msg = write_xlsx_with_osslist(bin_oss_list, _output_dir, output_files['BIN'], BIN_SHEET)
+            success, err_msg = write_output_with_osslist(bin_oss_list, _output_dir, output_files['BIN'],
+                                                         output_extension, BIN_SHEET)
             if not success:
                 logger.warning(err_msg)
         if duplicates:
@@ -264,28 +266,35 @@ def correct_scanner_result(_output_dir, output_files, exist_src, exist_bin):
     return
 
 
-def write_xlsx_with_osslist(oss_list, output_dir, output_file, sheetname):
+def write_output_with_osslist(oss_list, output_dir, output_file, output_extension, sheetname):
+    new_oss_list = []
     sheet_list = {}
     sheet_list[sheetname] = []
-    new_oss_list = []
 
     for src_item in oss_list:
         new_oss_list.append(src_item.get_print_array()[0])
     sheet_list[sheetname].extend(new_oss_list)
     if os.path.exists(os.path.join(output_dir, output_file)):
         os.remove(os.path.join(output_dir, output_file))
-    success, err_msg, result_file = write_output_file(os.path.join(output_dir, output_file).rstrip('xlsx'), '.xlsx',
-                                                      sheet_list)
+    success, err_msg, _ = write_output_file(os.path.join(output_dir, output_file).rstrip(output_extension),
+                                            output_extension, sheet_list)
     return success, err_msg
 
 
-def get_osslist_with_xlsx(_output_dir, output_file, sheet_name):
+def get_osslist(_output_dir, output_file, output_extension, sheet_name=''):
+    err_reason = ''
     oss_list = []
-    oss_xlsx = os.path.join(_output_dir, output_file)
-
-    if os.path.exists(oss_xlsx):
-        oss_list.extend(read_oss_report(oss_xlsx, sheet_name))
+    oss_file_with_fullpath = os.path.join(_output_dir, output_file)
 
+    if os.path.exists(oss_file_with_fullpath):
+        if output_extension == '.xlsx':
+            oss_list = read_oss_report(oss_file_with_fullpath, sheet_name)
+        elif output_extension == '.yaml':
+            oss_list, _, err_reason = parsing_yml(oss_file_with_fullpath, _output_dir)
+        else:
+            err_reason = f'Not supported extension: {output_extension}'
+    if err_reason:
+        logger.info(f'get_osslist: {err_reason}')
     return oss_list
 
 

src/fosslight_scanner/fosslight_scanner.py

@@ -148,11 +148,10 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
                                                             -1, source_analysis,
                                                             abs_path,
                                                             src_output,
-                                                            False, num_cores, True)
+                                                            False, num_cores)
                         if success:
                             sheet_list["SRC_FL_Source"] = [scan_item.get_row_to_print() for scan_item in result[2]]
-                            need_license = True if output_extension == ".xlsx" else False
-                            create_report_file(0, result[2], result[3], 'all', need_license,
+                            create_report_file(0, result[2], result[3], 'all', False,
                                                _output_dir, output_files["SRC"].split('.')[0], output_extension,
                                                correct_mode, correct_fpath, abs_path)
                     else:  # Run fosslight_source by using docker image
@@ -204,7 +203,7 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
                 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, exist_src, exist_bin)
+                correct_scanner_result(_output_dir, output_files, output_extension, exist_src, exist_bin)
         if output_extension == ".xlsx":
             if remove_src_data:
                 overwrite_excel(_output_dir, default_oss_name, "OSS Name")