Handle locked disks fixes #26

Author: imothee

TmpDisk/TmpDiskManager.swift

@@ -258,20 +258,88 @@ class TmpDiskManager {
                 if volume.tmpFs {
                     try FileManager.default.removeItem(atPath: volume.path())
                 }
-            } catch {
-                print(error)
+                DispatchQueue.main.async {
+                    self.volumes.remove(volume)
+                }
+                
+                if recreate {
+                    self.createTmpDisk(volume: volume, onCreate: {_ in })
+                }
+            } catch let error as NSError {
+                if error.code == fBsyErr {
+                    DispatchQueue.main.async {
+                        self.ejectErrorDiskInUse(name: volume.name, recreate: recreate)
+                    }
+                } else {
+                    DispatchQueue.main.async {
+                        self.ejectError(name: volume.name)
+                    }
+                }
             }
 
-            DispatchQueue.main.async {
-                self.volumes.remove(volume)
+            group.leave()
+        }
+        
+    }
+    
+    func forceEject(name: String, recreate: Bool) {
+        guard let volume = self.volumes.first(where: { name == $0.name }) else {
+            return
+        }
+        
+        let task = Process()
+        task.launchPath = "/sbin/umount"
+        
+        let command = volume.path()
+        task.arguments = ["-f", command]
+        
+        task.terminationHandler = { process in
+            if process.terminationStatus != 0 {
+                DispatchQueue.main.async {
+                    self.ejectError(name: name)
+                }
+                return
             }
 
-            if recreate {
-                self.createTmpDisk(volume: volume, onCreate: {_ in })
+            DispatchQueue.main.async {
+                self.volumes.remove(volume)
+                
+                if recreate {
+                    // We've force ejected so recreate the TmpDisk
+                    self.createTmpDisk(volume: volume, onCreate: {_ in })
+                }
             }
-            group.leave()
         }
 
+        if #available(macOS 10.13, *) {
+            do {
+                try task.run()
+            } catch {
+                print(error)
+            }
+        } else {
+            task.launch()
+        }
+    }
+    
+    func ejectErrorDiskInUse(name: String, recreate: Bool) {
+        let alert = NSAlert()
+        alert.messageText = String(format: NSLocalizedString("The volume \"%@\" wasn't ejected because one or more programs may be using it", comment: ""), name)
+        alert.informativeText = NSLocalizedString("To eject the disk immediately, hit the Force Eject button", comment: "")
+        alert.alertStyle = .warning
+        alert.addButton(withTitle: NSLocalizedString("Force Eject", comment: ""))
+        alert.addButton(withTitle: "Cancel")
+        if alert.runModal() == .alertFirstButtonReturn {
+            self.forceEject(name: name, recreate: recreate)
+        }
+    }
+    
+    func ejectError(name: String) {
+        let alert = NSAlert()
+        alert.messageText = String(format: NSLocalizedString("Failed to eject \"%@\"", comment: ""), name)
+        alert.alertStyle = .warning
+        alert.addButton(withTitle: "OK")
+        alert.runModal()
     }
 
     /*

TmpDisk/en.lproj/Localizable.strings

@@ -17,8 +17,13 @@
 "Your TmpDisk must have a name" = "Your TmpDisk must have a name";
 "A volume with this name already exists" = "A volume with this name already exists";
 "Size must be a number of megabytes > 0" = "Size must be a number of megabytes > 0";
+"Size must be a number of gigabytes >= 0.01" = "Size must be a number of gigabytes >= 0.01";
 "Failed to create TmpDisk" = "Failed to create TmpDisk";
 "Preferences" = "Preferences";
 "You can't change the root volume while tmpFS disks are mounted." = "You can't change the root volume while tmpFS disks are mounted.";
 "Icon must be square" = "Icon must be square";
 "Could not convert image to icon" = "Could not convert image to icon";
+"Failed to eject \"%@\"" = "Failed to eject \"%@\"";
+"The volume \"%@\" wasn't ejected because one or more programs may be using it" = "The volume \"%@\" wasn't ejected because one or more programs may be using it";
+"To eject the disk immediately, hit the Force Eject button" = "To eject the disk immediately, hit the Force Eject button";
+"Force Eject" = "Force Eject";

TmpDisk/zh-Hans.lproj/Localizable.strings

@@ -17,6 +17,13 @@
 "Your TmpDisk must have a name" = "你的 TmpDisk 必须有一个名字";
 "A volume with this name already exists" = "已存在同名的卷";
 "Size must be a number of megabytes > 0" = "大小必须是大于 0 的兆字节数";
+"Size must be a number of gigabytes >= 0.01" = "Size must be a number of gigabytes >= 0.01";
 "Failed to create TmpDisk" = "创建 TmpDisk 失败";
 "Preferences" = "Preferences";
 "You can't change the root volume while tmpFS disks are mounted." = "You can't change the root volume while tmpFS disks are mounted.";
+"Icon must be square" = "Icon must be square";
+"Could not convert image to icon" = "Could not convert image to icon";
+"Failed to eject \"%@\"" = "Failed to eject \"%@\"";
+"The volume \"%@\" wasn't ejected because one or more programs may be using it" = "The volume \"%@\" wasn't ejected because one or more programs may be using it";
+"To eject the disk immediately, hit the Force Eject button" = "To eject the disk immediately, hit the Force Eject button";
+"Force Eject" = "Force Eject";