fix: use bundle identifiers for app filtering

ejbills · ejbills · commit 4662f8d6954a · 2025-12-15T10:13:06.000-08:00
The app filter was not working for apps like Spotify because the filter stored app names but checked against NSRunningApplication.localizedName. - Store bundle identifiers when filtering apps (UI still shows names) - Check both bundle ID (exact match) and app name (contains) for compatibility - Add CoreServices path to include Finder in app list - Include custom app directories in filter scan Fixes #915
diff --git a/DockDoor/Utilities/DockObserver.swift b/DockDoor/Utilities/DockObserver.swift
@@ -171,6 +171,10 @@ final class DockObserver {
             return
         }
 
+        if WindowUtil.isAppFiltered(currentApp) {
+            return
+        }
+
         let currentAppInfo = ApplicationInfo(
             processIdentifier: currentApp.processIdentifier,
             bundleIdentifier: currentApp.bundleIdentifier,
@@ -537,6 +541,10 @@ final class DockObserver {
     }
 
     private func showPreviewForFocusedApp(app: NSRunningApplication) {
+        if WindowUtil.isAppFiltered(app) {
+            return
+        }
+
         Task { @MainActor [weak self] in
             guard let self else { return }
 
diff --git a/DockDoor/Utilities/Window Management/WindowUtil.swift b/DockDoor/Utilities/Window Management/WindowUtil.swift
@@ -218,6 +218,17 @@ enum WindowAction: String, Hashable, CaseIterable, Defaults.Serializable {
 enum WindowUtil {
     private static let desktopSpaceWindowCacheManager = SpaceWindowCacheManager()
 
+    static func isAppFiltered(_ app: NSRunningApplication) -> Bool {
+        let filters = Defaults[.appNameFilters]
+        guard !filters.isEmpty else { return false }
+
+        let bundleId = app.bundleIdentifier ?? ""
+        let appName = app.localizedName ?? ""
+
+        // Check bundle ID (new format) or app name (legacy format)
+        return filters.contains(bundleId) || filters.contains(where: { $0.caseInsensitiveCompare(appName) == .orderedSame })
+    }
+
     // Track windows explicitly updated by bringWindowToFront to prevent observer duplication
     private static var timestampUpdates: [AXUIElement: Date] = [:]
     private static let updateTimestampLock = NSLock()
@@ -531,6 +542,11 @@ extension WindowUtil {
     }
 
     static func getActiveWindows(of app: NSRunningApplication, context: WindowFetchContext = .dockPreview) async throws -> [WindowInfo] {
+        if isAppFiltered(app) {
+            purgeAppCache(with: app.processIdentifier)
+            return []
+        }
+
         var sckWindowIDs = Set<CGWindowID>()
 
         // Skip SCK if user has disabled image previews (compact mode only)
@@ -583,9 +599,7 @@ extension WindowUtil {
             return 0
         }
 
-        let appName = app.localizedName ?? ""
-        let appNameFilters = Defaults[.appNameFilters]
-        if !appNameFilters.isEmpty, appNameFilters.contains(where: { appName.lowercased().contains($0.lowercased()) }) {
+        if isAppFiltered(app) {
             purgeAppCache(with: pid)
             return 0
         }
@@ -726,16 +740,9 @@ extension WindowUtil {
             return
         }
 
-        if let appName = app.localizedName {
-            let appNameFilters = Defaults[.appNameFilters]
-            if !appNameFilters.isEmpty {
-                for filter in appNameFilters {
-                    if appName.lowercased().contains(filter.lowercased()) {
-                        purgeAppCache(with: app.processIdentifier)
-                        return
-                    }
-                }
-            }
+        if isAppFiltered(app) {
+            purgeAppCache(with: app.processIdentifier)
+            return
         }
 
         if let windowTitle = window.title {
diff --git a/DockDoor/Views/Settings/FiltersSettingsView.swift b/DockDoor/Views/Settings/FiltersSettingsView.swift
@@ -2,6 +2,14 @@ import AppKit
 import Defaults
 import SwiftUI
 
+struct InstalledApp: Identifiable {
+    let id: String
+    let name: String
+    let icon: NSImage
+
+    var bundleIdentifier: String { id }
+}
+
 struct FiltersSettingsView: View {
     @Default(.appNameFilters) var appNameFilters
     @Default(.windowTitleFilters) var windowTitleFilters
@@ -10,43 +18,65 @@ struct FiltersSettingsView: View {
     @State private var showingAddFilterSheet = false
     @State private var newFilter = FilterEntry(text: "")
     @State private var showingDirectoryPicker = false
+    @State private var installedApps: [InstalledApp] = []
+    @State private var isLoadingApps = true
 
     struct FilterEntry: Identifiable, Hashable {
         let id = UUID()
         var text: String
     }
 
-    private var installedApps: [(name: String, icon: NSImage)] {
-        var apps: [(String, NSImage)] = []
-        let appLocations = [
-            "/Applications",
-            "/System/Applications",
-            "/System/Applications/Utilities",
-            "~/Applications",
-        ]
-
-        for location in appLocations {
-            let expandedPath = NSString(string: location).expandingTildeInPath
+    private func loadInstalledApps() async -> [InstalledApp] {
+        await Task.detached(priority: .userInitiated) {
+            var apps: [InstalledApp] = []
+            let workspace = NSWorkspace.shared
             let fileManager = FileManager.default
-            guard let urls = try? fileManager.contentsOfDirectory(
-                at: URL(fileURLWithPath: expandedPath),
-                includingPropertiesForKeys: nil,
-                options: [.skipsHiddenFiles]
-            ) else { continue }
-
-            let locationApps = urls
-                .filter { $0.pathExtension == "app" }
-                .compactMap { url -> (String, NSImage)? in
-                    guard let bundle = Bundle(url: url),
+
+            let defaultLocations = [
+                "/Applications",
+                "/System/Applications",
+                "/System/Applications/Utilities",
+                "~/Applications",
+            ].map { NSString(string: $0).expandingTildeInPath }
+
+            let allLocations = Set(defaultLocations + Defaults[.customAppDirectories])
+
+            for directory in allLocations {
+                guard let enumerator = fileManager.enumerator(
+                    at: URL(fileURLWithPath: directory),
+                    includingPropertiesForKeys: [.isApplicationKey],
+                    options: [.skipsHiddenFiles, .skipsPackageDescendants]
+                ) else { continue }
+
+                for case let fileURL as URL in enumerator {
+                    guard fileURL.pathExtension == "app" else { continue }
+
+                    guard let bundle = Bundle(url: fileURL),
+                          let bundleId = bundle.bundleIdentifier,
                           let name = bundle.infoDictionary?["CFBundleName"] as? String ?? bundle.infoDictionary?["CFBundleDisplayName"] as? String
-                    else { return nil }
-                    return (name, NSWorkspace.shared.icon(forFile: url.path))
+                    else { continue }
+
+                    apps.append(InstalledApp(id: bundleId, name: name, icon: workspace.icon(forFile: fileURL.path)))
                 }
+            }
 
-            apps.append(contentsOf: locationApps)
-        }
+            // Add Finder explicitly
+            apps.append(InstalledApp(
+                id: "com.apple.finder",
+                name: "Finder",
+                icon: workspace.icon(forFile: "/System/Library/CoreServices/Finder.app")
+            ))
 
-        return apps.sorted { $0.0 < $1.0 }
+            // Remove duplicates and sort
+            var seenBundleIds = Set<String>()
+            return apps.filter { app in
+                if seenBundleIds.contains(app.id) {
+                    return false
+                }
+                seenBundleIds.insert(app.id)
+                return true
+            }.sorted { $0.name.localizedStandardCompare($1.name) == .orderedAscending }
+        }.value
     }
 
     var body: some View {
@@ -141,21 +171,37 @@ struct FiltersSettingsView: View {
 
                         ScrollView {
                             VStack(alignment: .leading, spacing: 4) {
-                                if installedApps.isEmpty {
-                                    Text("No applications found or scanned yet.")
+                                if isLoadingApps {
+                                    HStack {
+                                        Spacer()
+                                        ProgressView()
+                                            .scaleEffect(0.8)
+                                        Text("Loading applications...")
+                                            .foregroundColor(.secondary)
+                                        Spacer()
+                                    }
+                                    .padding()
+                                } else if installedApps.isEmpty {
+                                    Text("No applications found.")
                                         .foregroundColor(.secondary)
                                         .padding()
                                 } else {
-                                    ForEach(installedApps, id: \.name) { app in
+                                    ForEach(installedApps) { app in
                                         HStack(spacing: 8) {
                                             Toggle(isOn: Binding(
-                                                get: { !appNameFilters.contains(app.name) },
+                                                get: {
+                                                    // Check both bundle ID and legacy app name
+                                                    !appNameFilters.contains(app.bundleIdentifier) &&
+                                                        !appNameFilters.contains(where: { $0.caseInsensitiveCompare(app.name) == .orderedSame })
+                                                },
                                                 set: { isEnabled in
                                                     if isEnabled {
-                                                        appNameFilters.removeAll { $0 == app.name }
+                                                        // Remove both bundle ID and legacy app name
+                                                        appNameFilters.removeAll { $0 == app.bundleIdentifier }
+                                                        appNameFilters.removeAll { $0.caseInsensitiveCompare(app.name) == .orderedSame }
                                                     } else {
-                                                        if !appNameFilters.contains(app.name) {
-                                                            appNameFilters.append(app.name)
+                                                        if !appNameFilters.contains(app.bundleIdentifier) {
+                                                            appNameFilters.append(app.bundleIdentifier)
                                                         }
                                                     }
                                                 }
@@ -183,6 +229,11 @@ struct FiltersSettingsView: View {
                         )
                     }
                 }
+                .task(id: customAppDirectories) {
+                    isLoadingApps = true
+                    installedApps = await loadInstalledApps()
+                    isLoadingApps = false
+                }
 
                 // Window Title Filters Section
                 StyledGroupBox(label: "Window Title Filters") {
