Retain Pinned Programs on External Volumes

Whisky/Views/Bottle/Pins/PinView.swift

@@ -92,7 +92,10 @@ struct PinView: View {
             self.image = await task.value
         }
         .onChange(of: name) {
-            if let index = bottle.settings.pins.firstIndex(where: { $0.url == pin.url }) {
+            if let index = bottle.settings.pins.firstIndex(where: {
+                let exists = FileManager.default.fileExists(atPath: pin.url?.path(percentEncoded: false) ?? "")
+                return $0.url == pin.url && exists
+            }) {
                 bottle.settings.pins[index].name = name
             }
         }

Whisky/Views/Programs/ProgramsView.swift

@@ -123,13 +123,18 @@ struct ProgramsView: View {
 
     private func loadData() {
         loadPrograms()
-        blocklist = bottle.settings.blocklist
+        blocklist = bottle.settings.blocklist.filter({
+            return FileManager.default.fileExists(atPath: $0.path(percentEncoded: false))
+        })
     }
 
     private func loadPrograms() {
+        let programs = bottle.programs.filter({
+            return FileManager.default.fileExists(atPath: $0.url.path(percentEncoded: false))
+        })
         sortedPrograms = [
-            bottle.programs.pinned.sorted { $0.name < $1.name },
-            bottle.programs.unpinned.sorted { $0.name < $1.name }
+            programs.pinned.sorted { $0.name < $1.name },
+            programs.unpinned.sorted { $0.name < $1.name }
         ].flatMap { $0 }
     }
 }

WhiskyKit/Sources/WhiskyKit/Whisky/Bottle.swift

@@ -36,7 +36,8 @@ public final class Bottle: ObservableObject, Equatable, Hashable, Identifiable,
     public var pinnedPrograms: [(pin: PinnedProgram, program: Program, // swiftlint:disable:this large_tuple
                                  id: String)] {
         return settings.pins.compactMap { pin in
-            guard let program = programs.first(where: { $0.url == pin.url }) else { return nil }
+            let exists = FileManager.default.fileExists(atPath: pin.url?.path(percentEncoded: false) ?? "")
+            guard let program = programs.first(where: { $0.url == pin.url && exists }) else { return nil }
             return (pin, program, "\(pin.name)//\(program.url)")
         }
     }
@@ -63,7 +64,15 @@ public final class Bottle: ObservableObject, Equatable, Hashable, Identifiable,
             guard let url = pin.url else { return false }
             guard !found.contains(url) else { return false }
             found.insert(url)
-            return FileManager.default.fileExists(atPath: url.path(percentEncoded: false))
+            let urlPath = url.path(percentEncoded: false)
+            let volume: URL?
+            do {
+                volume = try url.resourceValues(forKeys: [.volumeURLKey]).volume ?? nil
+            } catch {
+                volume = nil
+            }
+            let legallyRemoved = pin.removable && volume == nil
+            return FileManager.default.fileExists(atPath: urlPath) || legallyRemoved
         }
     }
 

WhiskyKit/Sources/WhiskyKit/Whisky/BottleSettings.swift

@@ -23,16 +23,24 @@ import os.log
 public struct PinnedProgram: Codable, Hashable, Equatable {
     public var name: String
     public var url: URL?
+    public var removable: Bool
 
     public init(name: String, url: URL) {
         self.name = name
         self.url = url
+        do {
+            let volume = try url.resourceValues(forKeys: [.volumeURLKey]).volume
+            self.removable = try !(volume?.resourceValues(forKeys: [.volumeIsInternalKey]).volumeIsInternal ?? false)
+        } catch {
+            self.removable = false
+        }
     }
 
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         self.name = try container.decodeIfPresent(String.self, forKey: .name) ?? ""
         self.url = try container.decodeIfPresent(URL.self, forKey: .url)
+        self.removable = try container.decodeIfPresent(Bool.self, forKey: .removable) ?? false
     }
 }