Fix path of data to remove

VForWaTer · Apr 26, 2024 · 0d71c98 · 0d71c98
1 parent 1223ee7
commit 0d71c98
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/processes/result_remover.py b/processes/result_remover.py
@@ -124,6 +124,7 @@ def __init__(self, processor_def):
         super().__init__(processor_def, PROCESS_METADATA)
 
     def execute(self, data):
+        logging.info(f"Entered remove data")
         mimetype = 'application/json'
 
         try:
@@ -167,7 +168,7 @@ def __remove_folder(folder_list, folder_location, removed_list, not_removed_list
             """
             for i in folder_list:
                 try:
-                    shutil.rmtree(i)
+                    shutil.rmtree(f'{secrets["GEOAPI_PATH"]}/{folder_location}/{i}')
                     logging.info(f'Removed {folder_location} folder {i}')
                     removed_list.append(i)
                 except Exception as e:
@@ -185,7 +186,7 @@ def __remove_db_entry(entry_list, removed_list, not_removed_list, error_list):
 
             for i in entry_list:
                 try:
-                    os.remove(f'{secrets["DATA_PATH"]}/tinydb/{i}')
+                    os.remove(f'{secrets["GEOAPI_PATH"]}/tinydb/{i}')
                     removed_list.append(i)
                     not_removed_list.append(i)
                 except Exception as e:
@@ -194,8 +195,8 @@ def __remove_db_entry(entry_list, removed_list, not_removed_list, error_list):
 
             return removed_list, not_removed_list, error_list
 
-        removed, not_removed, error = __remove_folder(input_folders, 'input', removed, not_removed, error)
-        removed, not_removed, error = __remove_folder(output_folders, 'output', removed, not_removed, error)
+        removed, not_removed, error = __remove_folder(input_folders, 'in', removed, not_removed, error)
+        removed, not_removed, error = __remove_folder(output_folders, 'out', removed, not_removed, error)
         removed, not_removed, error = __remove_db_entry(job_list, removed, not_removed, error)
 
         outputs = {