Fixes order of operations when unmounting SSHFS folder

> see #54

Author: HorlogeSkynet

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Unmount on macOS
+- Unmount race conditions related to SSHFS mount point still present in project opened folders
 
 ### Removed
 

sshubl/actions.py

@@ -343,26 +343,24 @@ def run(self):
             f"{'M' if self.do_mount else 'Unm'}ounting ssh://{ssh_session}{self.remote_path}...",
         )
         try:
+            # Do-mounting : mount -> add folder to project
+            # Do-unmounting : remove folder from project -> unmount
             if self.do_mount:
                 mount_path = mount_sshfs(
                     self.identifier, typing.cast(PurePath, self.remote_path), self.mount_path
                 )
+                if mount_path is None:
+                    return
+                add_to_project_folders(
+                    str(mount_path), f"{ssh_session}{self.remote_path}", self.view.window()
+                )
             else:
                 mount_path = typing.cast(Path, self.mount_path)
+                remove_from_project_folders(str(mount_path), self.view.window())
                 umount_sshfs(mount_path)
         finally:
             self.view.erase_status("zz_mounting_sshfs")
 
-        if mount_path is None:
-            return
-
-        if self.do_mount:
-            add_to_project_folders(
-                str(mount_path), f"{ssh_session}{self.remote_path}", self.view.window()
-            )
-        else:
-            remove_from_project_folders(str(mount_path), self.view.window())
-
         # store/remove mount path in/from SSH session metadata
         with project_data_lock:
             if self.do_mount:

sshubl/listeners.py

@@ -87,17 +87,14 @@ def on_pre_close_window(self, window):
         #                    attempts will occur when re-opening the same project
         for identifier, ssh_session in SshSession.get_all_from_project_data(window).items():
             for mount_path in ssh_session.mounts:
+                remove_from_project_folders(mount_path, window)
                 umount_sshfs(Path(mount_path))
 
             ssh_disconnect(uuid.UUID(identifier))
 
             ssh_session.is_up = False
             ssh_session.set_in_project_data(window)
 
-            # remove mounts from project folders
-            for mount in ssh_session.mounts:
-                remove_from_project_folders(mount, window)
-
 
 class ViewEventListener(sublime_plugin.ViewEventListener):
     def on_load_async(self):