fix file removal logic

Signed-off-by: Lance-Drane <[email protected]>

Author: Lance-Drane

ipsframework/jupyter.py

@@ -166,7 +166,7 @@ def remove_last_data_file_from_notebook(dest: str, index: Optional[int] = None)
             if end_char == '\n':
                 # each entry gets its own "line", so we don't need to search anymore
                 break
-            if end_char == "'" and ips_cell[end_index] == ',':
+            if ips_cell[end_index] == "'" and ips_cell[end_index - 1] != '\\':
                 # we have found the name of the file
                 ret = ips_cell[file_name_start_index:end_index]
         except IndexError:

ipsframework/services.py

@@ -1971,7 +1971,10 @@ def add_data_file_to_notebook(self, data_file_path: str, timestamp: float, noteb
             if filename_to_remove is not None:
                 # now remove the state file from the filesystem
                 file_to_remove = os.path.join(self._jupyterhub_dir, 'data', filename_to_remove)
-                shutil.rmtree(file_to_remove, ignore_errors=True)
+                try:
+                    os.remove(file_to_remove)
+                except FileNotFoundError:
+                    pass
 
         # add newest data file to notebook
         add_data_file_to_notebook(f'{self._jupyterhub_dir}{notebook_name}', data_file_name, index)