From 42d00e04408ed6a6857cdb67d668478eb027a733 Mon Sep 17 00:00:00 2001
From: Marek Wolan <marek.wolan@methods.co.uk>
Date: Sun, 21 Jan 2024 16:33:51 +0000
Subject: [PATCH] Fix issue where file deleted flag wouldn't be reset

---
 .gitignore                                      |  1 +
 .../simulator/file_system/file_system.py        | 17 +++++++----------
 .../file_system/file_system_item_abc.py         |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 892751d9..1ce2ca9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -156,3 +156,4 @@ benchmark/output
 # src/primaite/notebooks/scratch.ipynb
 src/primaite/notebooks/scratch.py
 sandbox.py
+sandbox/
diff --git a/src/primaite/simulator/file_system/file_system.py b/src/primaite/simulator/file_system/file_system.py
index c2eb0d2d..149bf083 100644
--- a/src/primaite/simulator/file_system/file_system.py
+++ b/src/primaite/simulator/file_system/file_system.py
@@ -23,7 +23,6 @@ class FileSystem(SimComponent):
     "List containing all the folders in the file system."
     deleted_folders: Dict[str, Folder] = {}
     "List containing all the folders that have been deleted."
-    _folders_by_name: Dict[str, Folder] = {}
     sys_log: SysLog
     "Instance of SysLog used to create system logs."
     sim_root: Path
@@ -56,7 +55,6 @@ class FileSystem(SimComponent):
                 folder = self.deleted_folders[uuid]
                 self.deleted_folders.pop(uuid)
                 self.folders[uuid] = folder
-                self._folders_by_name[folder.name] = folder
 
         # Clear any other deleted folders that aren't original (have been created by agent)
         self.deleted_folders.clear()
@@ -67,7 +65,6 @@ class FileSystem(SimComponent):
             if uuid not in original_folder_uuids:
                 folder = self.folders[uuid]
                 self.folders.pop(uuid)
-                self._folders_by_name.pop(folder.name)
 
         # Now reset all remaining folders
         for folder in self.folders.values():
@@ -173,7 +170,6 @@ class FileSystem(SimComponent):
         folder = Folder(name=folder_name, sys_log=self.sys_log)
 
         self.folders[folder.uuid] = folder
-        self._folders_by_name[folder.name] = folder
         self._folder_request_manager.add_request(
             name=folder.uuid, request_type=RequestType(func=folder._request_manager)
         )
@@ -188,14 +184,13 @@ class FileSystem(SimComponent):
         if folder_name == "root":
             self.sys_log.warning("Cannot delete the root folder.")
             return
-        folder = self._folders_by_name.get(folder_name)
+        folder = self.get_folder(folder_name)
         if folder:
             # set folder to deleted state
             folder.delete()
 
             # remove from folder list
             self.folders.pop(folder.uuid)
-            self._folders_by_name.pop(folder.name)
 
             # add to deleted list
             folder.remove_all_files()
@@ -221,7 +216,10 @@ class FileSystem(SimComponent):
         :param folder_name: The folder name.
         :return: The matching Folder.
         """
-        return self._folders_by_name.get(folder_name)
+        for folder in self.folders.values():
+            if folder.name == folder_name:
+                return folder
+        return None
 
     def get_folder_by_id(self, folder_uuid: str, include_deleted: bool = False) -> Optional[Folder]:
         """
@@ -261,13 +259,13 @@ class FileSystem(SimComponent):
         """
         if folder_name:
             # check if file with name already exists
-            folder = self._folders_by_name.get(folder_name)
+            folder = self.get_folder(folder_name)
             # If not then create it
             if not folder:
                 folder = self.create_folder(folder_name)
         else:
             # Use root folder if folder_name not supplied
-            folder = self._folders_by_name["root"]
+            folder = self.get_folder("root")
 
         # Create the file and add it to the folder
         file = File(
@@ -474,7 +472,6 @@ class FileSystem(SimComponent):
 
         folder.restore()
         self.folders[folder.uuid] = folder
-        self._folders_by_name[folder.name] = folder
 
         if folder.deleted:
             self.deleted_folders.pop(folder.uuid)
diff --git a/src/primaite/simulator/file_system/file_system_item_abc.py b/src/primaite/simulator/file_system/file_system_item_abc.py
index 86cd1ee7..c3e1426b 100644
--- a/src/primaite/simulator/file_system/file_system_item_abc.py
+++ b/src/primaite/simulator/file_system/file_system_item_abc.py
@@ -87,7 +87,7 @@ class FileSystemItemABC(SimComponent):
 
     def set_original_state(self):
         """Sets the original state."""
-        vals_to_keep = {"name", "health_status", "visible_health_status", "previous_hash", "revealed_to_red"}
+        vals_to_keep = {"name", "health_status", "visible_health_status", "previous_hash", "revealed_to_red", "deleted"}
         self._original_state = self.model_dump(include=vals_to_keep)
 
     def describe_state(self) -> Dict: