Fix exclude error

Signed-off-by: Wonjae Park <[email protected]>

Author: JustinWonjaePark

src/fosslight_source/cli.py

@@ -12,6 +12,7 @@
 import fosslight_util.constant as constant
 from fosslight_util.set_log import init_log
 from fosslight_util.timer_thread import TimerThread
+from fosslight_util.exclude import excluding_files
 from ._help import print_version, print_help_msg_source_scanner
 from ._license_matched import get_license_list_to_print
 from fosslight_util.output_format import check_output_formats_v2, write_output_file
@@ -261,7 +262,8 @@ def create_report_file(
     return scan_item
 
 
-def merge_results(scancode_result: list = [], scanoss_result: list = [], spdx_downloads: dict = {}) -> list:
+def merge_results(scancode_result: list = [], scanoss_result: list = [], spdx_downloads: dict = {}, excluded_file_list=[]) -> list:
+
     """
     Merge scanner results and spdx parsing result.
     :param scancode_result: list of scancode results in SourceItem.
@@ -285,6 +287,11 @@ def merge_results(scancode_result: list = [], scanoss_result: list = [], spdx_do
                 new_result_item.download_location = download_location
                 scancode_result.append(new_result_item)
 
+    for i in range(len(scancode_result) - 1, -1, -1):  # Iterate from last to first
+        item_path = scancode_result[i].source_name_or_path  # Assuming SourceItem has 'file_path' attribute
+        if item_path in excluded_file_list:
+            del scancode_result[i]  # Delete matching item
+
     for item in scancode_result:
         item.set_oss_item()
 
@@ -329,6 +336,7 @@ def run_scanners(
 
     logger, result_log = init_log(os.path.join(output_path, f"fosslight_log_src_{start_time}.txt"),
                                   True, logging.INFO, logging.DEBUG, PKG_NAME, path_to_scan, path_to_exclude)
+    excluded_file_list = excluding_files(path_to_exclude, path_to_scan)
 
     if '.xlsx' not in output_extensions and print_matched_text:
         logger.warning("-m option is only available for excel.")
@@ -345,7 +353,7 @@ def run_scanners(
                                             path_to_exclude)
         if selected_scanner in SCANNER_TYPE:
             spdx_downloads = get_spdx_downloads(path_to_scan, path_to_exclude)
-            merged_result = merge_results(scancode_result, scanoss_result, spdx_downloads)
+            merged_result = merge_results(scancode_result, scanoss_result, spdx_downloads, excluded_file_list)
             scan_item = create_report_file(start_time, merged_result, license_list, scanoss_result, selected_scanner,
                                            print_matched_text, output_path, output_files, output_extensions, correct_mode,
                                            correct_filepath, path_to_scan, path_to_exclude, formats)