fix(import): detect foreign apps via LaunchServices (#1305) (#1318)

* fix(import): detect foreign apps via LaunchServices instead of data files (#1305)

* refactor(import): address review feedback — unify app URL discovery and scan workspaces

- Add installedAppURL() to the importer protocol with a default impl that
  uses LaunchServices. DBeaverImporter overrides to try all four product
  IDs (Community/Enterprise/Ultimate/Lite) in order.
- ImportFromAppSourcePicker now derives the app icon from
  importer.installedAppURL(). DBeaver Enterprise/Ultimate/Lite users get
  the correct icon instead of falling back to the SF Symbol bird.
- DBeaverImporter scans ~/Library/DBeaverData/workspace* for the latest
  workspace dir instead of hardcoding workspace6, so workspace7 (and any
  future bump) works without code changes.

Author: datlechin

CHANGELOG.md

@@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Import from other apps now detects TablePlus, Sequel Ace, and DBeaver via LaunchServices instead of probing for data files, so newly installed apps are picked up even before they have been opened (#1305)
 - ClickHouse (and any HTTP-based driver) can now connect to plain-HTTP servers addressed by DNS hostname; previously App Transport Security blocked the request because only IP-addressed plain HTTP is exempt by default (#1316)
 - Import from TablePlus now reads passwords from the keychain correctly; previously it queried the wrong service name and silently returned empty passwords without prompting
 - Port numbers in the import preview, welcome screen linked-file list, and plugin details no longer render with a thousand separator (e.g. 3306 instead of 3.306) under Vietnamese, German, and other locales that use a dot as a digit separator

TablePro/Core/Services/Export/ForeignApp/DBeaverImporter.swift

@@ -3,6 +3,7 @@
 //  TablePro
 //
 
+import AppKit
 import CommonCrypto
 import Foundation
 import os
@@ -16,11 +17,29 @@ struct DBeaverImporter: ForeignAppImporter {
     let symbolName = "bird"
     let appBundleIdentifier = "org.jkiss.dbeaver.core.product"
 
-    var workspaceBaseURL: URL = FileManager.default.homeDirectoryForCurrentUser
-        .appendingPathComponent("Library/DBeaverData/workspace6")
+    /// All known DBeaver Eclipse product identifiers. Community, Enterprise,
+    /// Ultimate, and Lite variants each register a different bundle ID, but
+    /// they all write to the same `~/Library/DBeaverData/workspace*`.
+    private static let knownBundleIdentifiers = [
+        "org.jkiss.dbeaver.core.product",
+        "org.jkiss.dbeaver.ee.core.product",
+        "org.jkiss.dbeaver.ue.product",
+        "org.jkiss.dbeaver.lite.product"
+    ]
+
+    /// Root directory containing DBeaver workspace folders. The actual
+    /// workspace path is discovered by scanning for `workspace*` subdirs so
+    /// future versions (workspace7, etc.) keep working without code changes.
+    var dbeaverDataRoot: URL = FileManager.default.homeDirectoryForCurrentUser
+        .appendingPathComponent("Library/DBeaverData")
 
-    func isAvailable() -> Bool {
-        findDataSourcesFile() != nil
+    func installedAppURL() -> URL? {
+        for bundleId in Self.knownBundleIdentifiers {
+            if let url = NSWorkspace.shared.urlForApplication(withBundleIdentifier: bundleId) {
+                return url
+            }
+        }
+        return nil
     }
 
     func connectionCount() -> Int {
@@ -100,18 +119,30 @@ struct DBeaverImporter: ForeignAppImporter {
 
     // MARK: - File Discovery
 
+    /// Scans `~/Library/DBeaverData/workspace*` for a project folder that
+    /// contains `.dbeaver/data-sources.json`. Supports any workspace version
+    /// (workspace6, workspace7, ...) by enumeration rather than hardcoding.
     private func findDataSourcesFile() -> URL? {
         let fm = FileManager.default
-        let basePath = workspaceBaseURL.path
-        guard fm.fileExists(atPath: basePath),
-              let contents = try? fm.contentsOfDirectory(atPath: basePath) else { return nil }
-
-        for dirName in contents {
-            let candidate = workspaceBaseURL
-                .appendingPathComponent(dirName)
-                .appendingPathComponent(".dbeaver/data-sources.json")
-            if fm.fileExists(atPath: candidate.path) {
-                return candidate
+        guard let workspaceDirs = try? fm.contentsOfDirectory(
+            at: dbeaverDataRoot,
+            includingPropertiesForKeys: [.isDirectoryKey],
+            options: [.skipsHiddenFiles]
+        ) else { return nil }
+
+        let workspaces = workspaceDirs
+            .filter { $0.lastPathComponent.hasPrefix("workspace") }
+            .sorted { $0.lastPathComponent > $1.lastPathComponent }
+
+        for workspace in workspaces {
+            guard let projects = try? fm.contentsOfDirectory(atPath: workspace.path) else { continue }
+            for projectName in projects {
+                let candidate = workspace
+                    .appendingPathComponent(projectName)
+                    .appendingPathComponent(".dbeaver/data-sources.json")
+                if fm.fileExists(atPath: candidate.path) {
+                    return candidate
+                }
             }
         }
         return nil

TablePro/Core/Services/Export/ForeignApp/ForeignAppImporter.swift

@@ -3,6 +3,7 @@
 //  TablePro
 //
 
+import AppKit
 import Foundation
 import os
 import Security
@@ -13,12 +14,29 @@ protocol ForeignAppImporter {
     var id: String { get }
     var displayName: String { get }
     var symbolName: String { get }
+    /// Canonical bundle identifier of the source app. Importers whose source
+    /// app ships in multiple editions (e.g. DBeaver Community / Enterprise)
+    /// should override `installedAppURL()` to look those up as well.
     var appBundleIdentifier: String { get }
-    func isAvailable() -> Bool
+    func installedAppURL() -> URL?
     func connectionCount() -> Int
     func importConnections(includePasswords: Bool) throws -> ForeignAppImportResult
 }
 
+extension ForeignAppImporter {
+    /// LaunchServices lookup for the source app. Returns the URL on disk if
+    /// the app is registered with macOS, regardless of whether the user has
+    /// opened it or created any data. Override to consider multiple editions.
+    func installedAppURL() -> URL? {
+        NSWorkspace.shared.urlForApplication(withBundleIdentifier: appBundleIdentifier)
+    }
+
+    /// Convenience: true when the source app is installed.
+    func isAvailable() -> Bool {
+        installedAppURL() != nil
+    }
+}
+
 // MARK: - Result
 
 struct ForeignAppImportResult {

TablePro/Core/Services/Export/ForeignApp/SequelAceImporter.swift

@@ -20,10 +20,6 @@ struct SequelAceImporter: ForeignAppImporter {
                 + "Sequel Ace/Data/Favorites.plist"
         )
 
-    func isAvailable() -> Bool {
-        FileManager.default.fileExists(atPath: favoritesFileURL.path)
-    }
-
     func connectionCount() -> Int {
         guard let root = loadRootDict() else { return 0 }
         guard let favoritesRoot = root["Favorites Root"] as? [String: Any],

TablePro/Core/Services/Export/ForeignApp/TablePlusImporter.swift

@@ -21,10 +21,6 @@ struct TablePlusImporter: ForeignAppImporter {
     var groupsFileURL: URL = FileManager.default.homeDirectoryForCurrentUser
         .appendingPathComponent("Library/Application Support/com.tinyapp.TablePlus/Data/ConnectionGroups.plist")
 
-    func isAvailable() -> Bool {
-        FileManager.default.fileExists(atPath: connectionsFileURL.path)
-    }
-
     func connectionCount() -> Int {
         guard let data = try? Data(contentsOf: connectionsFileURL),
               let plist = try? PropertyListSerialization.propertyList(from: data, format: nil),

TablePro/Views/Connection/ImportFromApp/ImportFromAppSourcePicker.swift

@@ -96,9 +96,8 @@ struct ImportFromAppSourcePicker: View {
 
     @ViewBuilder
     private func appIcon(for importer: any ForeignAppImporter) -> some View {
-        let icon = resolveAppIcon(bundleId: importer.appBundleIdentifier)
-        if let icon {
-            Image(nsImage: icon)
+        if let appURL = importer.installedAppURL() {
+            Image(nsImage: NSWorkspace.shared.icon(forFile: appURL.path))
                 .resizable()
                 .aspectRatio(contentMode: .fit)
         } else {
@@ -173,8 +172,4 @@ struct ImportFromAppSourcePicker: View {
         onSelect(state.importer, includePasswords)
     }
 
-    private func resolveAppIcon(bundleId: String) -> NSImage? {
-        guard let appURL = NSWorkspace.shared.urlForApplication(withBundleIdentifier: bundleId) else { return nil }
-        return NSWorkspace.shared.icon(forFile: appURL.path)
-    }
 }