Remove excluded items from scancode_result

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

Author: JustinWonjaePark

src/fosslight_source/cli.py

@@ -282,15 +282,17 @@ 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 item in scancode_result:
+    for i in range(len(scancode_result) - 1, -1, -1):
+        item = scancode_result[i]
         item_path = item.source_name_or_path
-        if any(
-            excluded in item_path and 
-            (item_path == excluded or item_path.startswith(f"{excluded}{os.sep}"))
+
+        if not any(
+            item_path == excluded or item_path.startswith(f"{excluded}{os.sep}")
             for excluded in path_to_exclude
         ):
-            continue
-        item.set_oss_item()
+            item.set_oss_item()
+        else:
+            del scancode_result[i]
 
     return scancode_result
 

src/fosslight_source/run_scanoss.py

@@ -110,6 +110,9 @@ def run_scanoss_py(path_to_scan: str, output_file_name: str = "", format: list =
 
     try:
         if write_json_file:
+            destination_file = os.path.join(output_path, SCANOSS_RESULT_FILE)
+            if os.path.exists(destination_file):
+                os.remove(destination_file)
             shutil.move(SCANOSS_RESULT_FILE, output_path)
         else:
             os.remove(output_json_file)