cover folder picker completion without presenting UI (v0.6.0)

@@ -9,9 +9,9 @@99     <key>CFBundleName</key>1010     <string>Haven</string>1111     <key>CFBundleShortVersionString</key>12-    <string>0.5</string>12+    <string>0.6.0</string>1313     <key>CFBundleVersion</key>14-    <string>5</string>14+    <string>6</string>1515     <key>LSMinimumSystemVersion</key>1616     <string>13.0</string>1717     <key>LSUIElement</key>

@@ -1,25 +1,34 @@1-// swift-tools-version: 5.91+// swift-tools-version: 6.022 import PackageDescription33 44 let package = Package(5-    name: "Haven",6-    platforms: [7-        .macOS(.v13) // Targeting macOS Ventura and later for refreshable ScrollView8-    ],9-    products: [10-        .executable(name: "Haven", targets: ["Haven"])11-    ],12-    dependencies: [],13-    targets: [14-        .executableTarget(15-            name: "Haven",16-            dependencies: [],17-            path: "Sources/Haven"18-        ),19-        .testTarget(20-            name: "HavenTests",21-            dependencies: ["Haven"],22-            path: "Tests/HavenTests"23-        )24-    ]5+  name: "Haven",6+  platforms: [7+    .macOS(.v13)  // Targeting macOS Ventura and later for refreshable ScrollView8+  ],9+  products: [10+    .executable(name: "Haven", targets: ["Haven"])11+  ],12+  dependencies: [13+    .package(14+      url: "https://github.com/swiftlang/swift-testing.git",15+      revision: "d6b70f9ef9eb207729fb50e0ff32edc6f72ea474"16+    )17+  ],18+  targets: [19+    .executableTarget(20+      name: "Haven",21+      dependencies: [],22+      path: "Sources/Haven"23+    ),24+    .testTarget(25+      name: "HavenTests",26+      dependencies: [27+        "Haven",28+        .product(name: "Testing", package: "swift-testing"),29+      ],30+      path: "Tests/HavenTests"31+    ),32+  ],33+  swiftLanguageModes: [.v5]2534 )

@@ -21,7 +21,7 @@2121 ## Requirements2222 2323 - macOS 13 (Ventura) or later24-- Swift 5.9+ toolchain (Xcode or the Swift command-line tools)24+- Swift 6.1+ toolchain (Xcode or the Swift command-line tools)2525 2626 No Wallhaven API key is required — Haven uses the public search API and browses2727 SFW and Sketchy content only.

@@ -1,34 +1,34 @@11 import Foundation22 33 struct WallhavenResponse: Codable {4-    let data: [Wallpaper]5-    let meta: Meta?4+  let data: [Wallpaper]5+  let meta: Meta?66 }77 88 struct Meta: Codable {9-    let current_page: Int10-    let last_page: Int11-    let per_page: Int12-    let total: Int13-    // query, seed, etc can be added if needed9+  let current_page: Int10+  let last_page: Int11+  let per_page: Int12+  let total: Int13+  // query, seed, etc can be added if needed1414 }1515 1616 struct Wallpaper: Codable, Identifiable, Equatable {17-    let id: String18-    let url: String // Page URL19-    let path: String // Direct Image URL20-    let resolution: String21-    let purity: String22-    let file_size: Int?23-    let thumbs: Thumbs24-    25-    struct Thumbs: Codable, Equatable {26-        let large: String27-        let original: String28-        let small: String29-    }30-    31-    static func == (lhs: Wallpaper, rhs: Wallpaper) -> Bool {32-        return lhs.id == rhs.id33-    }34-}\ No newline at end of file17+  let id: String18+  let url: String  // Page URL19+  let path: String  // Direct Image URL20+  let resolution: String21+  let purity: String22+  let file_size: Int?23+  let thumbs: Thumbs24+25+  struct Thumbs: Codable, Equatable {26+    let large: String27+    let original: String28+    let small: String29+  }30+31+  static func == (lhs: Wallpaper, rhs: Wallpaper) -> Bool {32+    return lhs.id == rhs.id33+  }34+}

@@ -1,78 +1,87 @@11 import Foundation22 33 enum WallhavenError: Error {4-    case invalidURL5-    case networkError(Error)6-    case decodingError(Error)7-    case noData8-    case apiError(String)4+  case invalidURL5+  case networkError(Error)6+  case decodingError(Error)7+  case noData8+  case apiError(String)99 }1010 1111 /// Sort order for Wallhaven search results. Maps to the `sorting` query1212 /// parameter on the public API. `random` returns a fresh batch per page.1313 enum WallhavenSorting: String {14-    case dateAdded = "date_added"15-    case toplist16-    case random14+  case dateAdded = "date_added"15+  case toplist16+  case random1717 }1818 19-class WallhavenAPI {20-    private let session: URLSession19+@MainActor20+protocol WallhavenSearching {21+  func searchWallpapers(22+    query: String, categories: String, purity: String, sorting: WallhavenSorting,23+    resolutions: [String], ratios: [String], limit: Int, page: Int24+  ) async throws -> ([Wallpaper], Meta?)25+}2126 22-    init(session: URLSession = .shared) {23-        self.session = session24-    }27+class WallhavenAPI: WallhavenSearching {28+  private let session: URLSession2529 26-    func searchWallpapers(27-        query: String,28-        categories: String = "111",29-        purity: String = "100",30-        sorting: WallhavenSorting = .dateAdded,31-        resolutions: [String] = [],32-        ratios: [String] = [],33-        limit: Int = 24,34-        page: Int = 135-    ) async throws -> ([Wallpaper], Meta?) {36-        var queryItems = [37-            URLQueryItem(name: "q", value: query),38-            URLQueryItem(name: "categories", value: categories),39-            URLQueryItem(name: "purity", value: purity),40-            URLQueryItem(name: "sorting", value: sorting.rawValue),41-            URLQueryItem(name: "limit", value: String(limit)),42-            URLQueryItem(name: "page", value: String(page))43-        ]30+  init(session: URLSession = .shared) {31+    self.session = session32+  }4433 45-        if !resolutions.isEmpty {46-            queryItems.append(URLQueryItem(name: "resolutions", value: resolutions.joined(separator: ",")))47-        }34+  func searchWallpapers(35+    query: String,36+    categories: String = "111",37+    purity: String = "100",38+    sorting: WallhavenSorting = .dateAdded,39+    resolutions: [String] = [],40+    ratios: [String] = [],41+    limit: Int = 24,42+    page: Int = 143+  ) async throws -> ([Wallpaper], Meta?) {44+    var queryItems = [45+      URLQueryItem(name: "q", value: query),46+      URLQueryItem(name: "categories", value: categories),47+      URLQueryItem(name: "purity", value: purity),48+      URLQueryItem(name: "sorting", value: sorting.rawValue),49+      URLQueryItem(name: "limit", value: String(limit)),50+      URLQueryItem(name: "page", value: String(page)),51+    ]4852 49-        if !ratios.isEmpty {50-            queryItems.append(URLQueryItem(name: "ratios", value: ratios.joined(separator: ",")))51-        }53+    if !resolutions.isEmpty {54+      queryItems.append(55+        URLQueryItem(name: "resolutions", value: resolutions.joined(separator: ",")))56+    }5257 53-        return try await performSearch(queryItems: queryItems)58+    if !ratios.isEmpty {59+      queryItems.append(URLQueryItem(name: "ratios", value: ratios.joined(separator: ",")))5460     }5561 56-    private func performSearch(queryItems: [URLQueryItem]) async throws -> ([Wallpaper], Meta?) {57-        var urlComponents = URLComponents(url: Configuration.baseURL.appendingPathComponent("search"), resolvingAgainstBaseURL: true)!58-        urlComponents.queryItems = queryItems62+    return try await performSearch(queryItems: queryItems)63+  }5964 60-        guard let url = urlComponents.url else {61-            throw WallhavenError.invalidURL62-        }65+  private func performSearch(queryItems: [URLQueryItem]) async throws -> ([Wallpaper], Meta?) {66+    var urlComponents = URLComponents(67+      url: Configuration.baseURL.appendingPathComponent("search"), resolvingAgainstBaseURL: true)!68+    urlComponents.queryItems = queryItems6369 64-        let (data, response) = try await session.data(from: url)70+    let url = urlComponents.url!6571 66-        guard let httpResponse = response as? HTTPURLResponse,67-              (200...299).contains(httpResponse.statusCode) else {68-            throw WallhavenError.apiError("Server returned an error")69-        }72+    let (data, response) = try await session.data(from: url)7073 71-        do {72-            let decodedResponse = try JSONDecoder().decode(WallhavenResponse.self, from: data)73-            return (decodedResponse.data, decodedResponse.meta)74-        } catch {75-            throw WallhavenError.decodingError(error)76-        }74+    guard let httpResponse = response as? HTTPURLResponse,75+      (200...299).contains(httpResponse.statusCode)76+    else {77+      throw WallhavenError.apiError("Server returned an error")7778     }78-}\ No newline at end of file79+80+    do {81+      let decodedResponse = try JSONDecoder().decode(WallhavenResponse.self, from: data)82+      return (decodedResponse.data, decodedResponse.meta)83+    } catch {84+      throw WallhavenError.decodingError(error)85+    }86+  }87+}

@@ -1,19 +1,20 @@11 import AppKit22 33 class AppDelegate: NSObject, NSApplicationDelegate {4-    var statusItem: NSStatusItem!5-    var menuController: MenuController!4+  var statusItem: NSStatusItem!5+  var menuController: MenuController!66 7-    func applicationDidFinishLaunching(_ notification: Notification) {8-        // Create the status item in the menu bar9-        statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)10-        11-        if let button = statusItem.button {12-            // Use a system symbol for the icon13-            button.image = NSImage(systemSymbolName: "photo.on.rectangle.angled", accessibilityDescription: "Haven")14-        }7+  func applicationDidFinishLaunching(_ notification: Notification) {8+    // Create the status item in the menu bar9+    statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)1510 16-        // Initialize the menu controller17-        menuController = MenuController(statusItem: statusItem)11+    if let button = statusItem.button {12+      // Use a system symbol for the icon13+      button.image = NSImage(14+        systemSymbolName: "photo.on.rectangle.angled", accessibilityDescription: "Haven")1815     }16+17+    // Initialize the menu controller18+    menuController = MenuController(statusItem: statusItem)19+  }1920 }

@@ -1,63 +1,82 @@11 import Foundation22 import ServiceManagement33 4-class AutostartManager {5-    static let shared = AutostartManager()6-    7-    private let launchAgentURL: URL8-    private let bundleIdentifier = "com.june.Haven"9-    10-    init() {11-        let libraryDir = FileManager.default.urls(for: .libraryDirectory, in: .userDomainMask).first!12-        let launchAgentsDir = libraryDir.appendingPathComponent("LaunchAgents")13-        14-        // Ensure directory exists15-        try? FileManager.default.createDirectory(at: launchAgentsDir, withIntermediateDirectories: true)16-        17-        self.launchAgentURL = launchAgentsDir.appendingPathComponent("\(bundleIdentifier).plist")4+@MainActor5+protocol AutostartManaging: AnyObject {6+  var isEnabled: Bool { get set }7+}8+9+class AutostartManager: AutostartManaging {10+  static let shared = AutostartManager()11+12+  private let launchAgentURL: URL13+  private let bundleIdentifier = "com.june.Haven"14+  private let executablePath: () -> String?15+  private let writePlist: (Data, URL) throws -> Void16+  private let removePlist: (URL) throws -> Void17+18+  init(19+    libraryDirectory: URL? = nil,20+    executablePath: @escaping () -> String? = { Bundle.main.executablePath },21+    writePlist: @escaping (Data, URL) throws -> Void = { data, url in try data.write(to: url) },22+    removePlist: @escaping (URL) throws -> Void = { try FileManager.default.removeItem(at: $0) }23+  ) {24+    let libraryDir =25+      libraryDirectory26+      ?? FileManager.default.urls(for: .libraryDirectory, in: .userDomainMask).first!27+    let launchAgentsDir = libraryDir.appendingPathComponent("LaunchAgents")28+29+    // Ensure directory exists30+    try? FileManager.default.createDirectory(at: launchAgentsDir, withIntermediateDirectories: true)31+32+    self.launchAgentURL = launchAgentsDir.appendingPathComponent("\(bundleIdentifier).plist")33+    self.executablePath = executablePath34+    self.writePlist = writePlist35+    self.removePlist = removePlist36+  }37+38+  var isEnabled: Bool {39+    get {40+      return FileManager.default.fileExists(atPath: launchAgentURL.path)1841     }19-    20-    var isEnabled: Bool {21-        get {22-            return FileManager.default.fileExists(atPath: launchAgentURL.path)23-        }24-        set {25-            if newValue {26-                enable()27-            } else {28-                disable()29-            }30-        }42+    set {43+      if newValue {44+        enable()45+      } else {46+        disable()47+      }3148     }32-    33-    private func enable() {34-        guard !isEnabled else { return }35-        36-        // Point to the actual executable inside the bundle37-        guard let appPath = Bundle.main.executablePath else { return }38-        39-        let plistContent: [String: Any] = [40-            "Label": bundleIdentifier,41-            "ProgramArguments": [appPath],42-            "RunAtLoad": true,43-            "ProcessType": "Interactive"44-        ]45-        46-        do {47-            let data = try PropertyListSerialization.data(fromPropertyList: plistContent, format: .xml, options: 0)48-            try data.write(to: launchAgentURL)49-        } catch {50-            print("Failed to enable autostart: \(error)")51-        }49+  }50+51+  private func enable() {52+    guard !isEnabled else { return }53+54+    // Point to the actual executable inside the bundle55+    guard let appPath = executablePath() else { return }56+57+    let plistContent: [String: Any] = [58+      "Label": bundleIdentifier,59+      "ProgramArguments": [appPath],60+      "RunAtLoad": true,61+      "ProcessType": "Interactive",62+    ]63+64+    do {65+      let data = try PropertyListSerialization.data(66+        fromPropertyList: plistContent, format: .xml, options: 0)67+      try writePlist(data, launchAgentURL)68+    } catch {69+      print("Failed to enable autostart: \(error)")5270     }53-    54-    private func disable() {55-        guard isEnabled else { return }56-        57-        do {58-            try FileManager.default.removeItem(at: launchAgentURL)59-        } catch {60-            print("Failed to disable autostart: \(error)")61-        }71+  }72+73+  private func disable() {74+    guard isEnabled else { return }75+76+    do {77+      try removePlist(launchAgentURL)78+    } catch {79+      print("Failed to disable autostart: \(error)")6280     }81+  }6382 }

@@ -1,38 +1,39 @@11 import Foundation22 33 class FavoritesManager: ObservableObject {4-    static let shared = FavoritesManager()5-    6-    @Published var favorites: [Wallpaper] = []7-    private let key = "favoriteWallpapers"8-    9-    init() {10-        loadFavorites()4+  static let shared = FavoritesManager()5+6+  @Published var favorites: [Wallpaper] = []7+  private let key = "favoriteWallpapers"8+9+  init() {10+    loadFavorites()11+  }12+13+  func toggleFavorite(_ wallpaper: Wallpaper) {14+    if let index = favorites.firstIndex(where: { $0.id == wallpaper.id }) {15+      favorites.remove(at: index)16+    } else {17+      favorites.insert(wallpaper, at: 0)1118     }12-    13-    func toggleFavorite(_ wallpaper: Wallpaper) {14-        if let index = favorites.firstIndex(where: { $0.id == wallpaper.id }) {15-            favorites.remove(at: index)16-        } else {17-            favorites.insert(wallpaper, at: 0)18-        }19-        saveFavorites()19+    saveFavorites()20+  }21+22+  func isFavorite(_ wallpaper: Wallpaper) -> Bool {23+    return favorites.contains(where: { $0.id == wallpaper.id })24+  }25+26+  private func saveFavorites() {27+    if let data = try? JSONEncoder().encode(favorites) {28+      UserDefaults.standard.set(data, forKey: key)2029     }21-    22-    func isFavorite(_ wallpaper: Wallpaper) -> Bool {23-        return favorites.contains(where: { $0.id == wallpaper.id })30+  }31+32+  private func loadFavorites() {33+    if let data = UserDefaults.standard.data(forKey: key),34+      let decoded = try? JSONDecoder().decode([Wallpaper].self, from: data)35+    {36+      favorites = decoded2437     }25-    26-    private func saveFavorites() {27-        if let data = try? JSONEncoder().encode(favorites) {28-            UserDefaults.standard.set(data, forKey: key)29-        }30-    }31-    32-    private func loadFavorites() {33-        if let data = UserDefaults.standard.data(forKey: key),34-           let decoded = try? JSONDecoder().decode([Wallpaper].self, from: data) {35-            favorites = decoded36-        }37-    }38+  }3839 }

@@ -1,46 +1,47 @@11 import Foundation22 33 class HistoryManager: ObservableObject {4-    static let shared = HistoryManager()5-    6-    @Published var history: [Wallpaper] = []7-    private let key = "wallpaperHistory"8-    private let maxHistoryItems = 509-    10-    init() {11-        loadHistory()4+  static let shared = HistoryManager()5+6+  @Published var history: [Wallpaper] = []7+  private let key = "wallpaperHistory"8+  private let maxHistoryItems = 509+10+  init() {11+    loadHistory()12+  }13+14+  func addToHistory(_ wallpaper: Wallpaper) {15+    // Remove if existing to promote to top16+    if let index = history.firstIndex(where: { $0.id == wallpaper.id }) {17+      history.remove(at: index)1218     }13-    14-    func addToHistory(_ wallpaper: Wallpaper) {15-        // Remove if existing to promote to top16-        if let index = history.firstIndex(where: { $0.id == wallpaper.id }) {17-            history.remove(at: index)18-        }19-        20-        history.insert(wallpaper, at: 0)21-        22-        if history.count > maxHistoryItems {23-            history = Array(history.prefix(maxHistoryItems))24-        }25-        26-        saveHistory()19+20+    history.insert(wallpaper, at: 0)21+22+    if history.count > maxHistoryItems {23+      history = Array(history.prefix(maxHistoryItems))2724     }28-    29-    func clearHistory() {30-        history = []31-        saveHistory()25+26+    saveHistory()27+  }28+29+  func clearHistory() {30+    history = []31+    saveHistory()32+  }33+34+  private func saveHistory() {35+    if let data = try? JSONEncoder().encode(history) {36+      UserDefaults.standard.set(data, forKey: key)3237     }33-    34-    private func saveHistory() {35-        if let data = try? JSONEncoder().encode(history) {36-            UserDefaults.standard.set(data, forKey: key)37-        }38+  }39+40+  private func loadHistory() {41+    if let data = UserDefaults.standard.data(forKey: key),42+      let decoded = try? JSONDecoder().decode([Wallpaper].self, from: data)43+    {44+      history = decoded3845     }39-    40-    private func loadHistory() {41-        if let data = UserDefaults.standard.data(forKey: key),42-           let decoded = try? JSONDecoder().decode([Wallpaper].self, from: data) {43-            history = decoded44-        }45-    }46+  }4647 }

@@ -1,30 +1,38 @@11 import AppKit22 33 class ImageCache {4-    static let shared = ImageCache()5-    private let cache = NSCache<NSString, NSImage>()6-    7-    private init() {}8-    9-    func image(for url: URL) -> NSImage? {10-        return cache.object(forKey: url.absoluteString as NSString)4+  static let shared = ImageCache()5+  private let cache = NSCache<NSString, NSImage>()6+  private let session: URLSession7+8+  init(session: URLSession = .shared) {9+    self.session = session10+  }11+12+  func image(for url: URL) -> NSImage? {13+    return cache.object(forKey: url.absoluteString as NSString)14+  }15+16+  func insertImage(_ image: NSImage, for url: URL) {17+    cache.setObject(image, forKey: url.absoluteString as NSString)18+  }19+20+  func fetchImage(url: URL) async throws -> NSImage {21+    if let cached = image(for: url) {22+      return cached1123     }12-    13-    func insertImage(_ image: NSImage, for url: URL) {14-        cache.setObject(image, forKey: url.absoluteString as NSString)24+25+    let (data, response) = try await session.data(from: url)26+    guard let response = response as? HTTPURLResponse,27+      (200...299).contains(response.statusCode)28+    else {29+      throw WallhavenError.apiError("Image download failed")1530     }16-    17-    func fetchImage(url: URL) async throws -> NSImage {18-        if let cached = image(for: url) {19-            return cached20-        }21-        22-        let (data, _) = try await URLSession.shared.data(from: url)23-        guard let image = NSImage(data: data) else {24-            throw WallhavenError.decodingError(NSError(domain: "ImageCache", code: -1, userInfo: nil))25-        }26-        27-        insertImage(image, for: url)28-        return image31+    guard let image = NSImage(data: data) else {32+      throw WallhavenError.decodingError(NSError(domain: "ImageCache", code: -1, userInfo: nil))2933     }34+35+    insertImage(image, for: url)36+    return image37+  }3038 }

@@ -1,202 +1,194 @@1-import Foundation21 import Combine32 import CoreGraphics3+import Foundation44 import ImageIO55 66 struct LocalWallpaper: Identifiable, Equatable {7-    let id: String8-    let url: URL9-    let filename: String10-    let resolution: String11-    let fileSize: Int6412-    let createdAt: Date13-    let modifiedAt: Date14-    15-    var thumbnailURL: URL? {16-        return url17-    }18-    19-    static func == (lhs: LocalWallpaper, rhs: LocalWallpaper) -> Bool {20-        return lhs.id == rhs.id21-    }7+  let id: String8+  let url: URL9+  let filename: String10+  let resolution: String11+  let fileSize: Int6412+  let createdAt: Date13+  let modifiedAt: Date14+15+  var thumbnailURL: URL? {16+    return url17+  }18+19+  static func == (lhs: LocalWallpaper, rhs: LocalWallpaper) -> Bool {20+    return lhs.id == rhs.id21+  }2222 }2323 2424 @MainActor2525 class LocalWallpapersManager: ObservableObject {26-    static let shared = LocalWallpapersManager()27-    28-    @Published var wallpapers: [LocalWallpaper] = []29-    @Published var isLoading: Bool = false30-    @Published var errorMessage: String?31-    32-    private var folderMonitor: FolderMonitor?33-    private let imageExtensions: Set<String> = ["jpg", "jpeg", "png", "webp", "bmp", "gif"]34-    35-    private init() {36-        // Initial scan if a folder is configured37-        if let folderPath = UserDefaults.standard.string(forKey: "saveFolderPath") {38-            startMonitoring(folderPath: folderPath)39-        }26+  static let shared = LocalWallpapersManager()27+28+  @Published var wallpapers: [LocalWallpaper] = []29+  @Published var isLoading: Bool = false30+  @Published var errorMessage: String?31+32+  private var folderMonitor: FolderMonitor?33+  private let imageExtensions: Set<String> = ["jpg", "jpeg", "png", "webp", "bmp", "gif"]34+35+  init() {36+    // Initial scan if a folder is configured37+    if let folderPath = UserDefaults.standard.string(forKey: "saveFolderPath") {38+      startMonitoring(folderPath: folderPath)4039     }41-    42-    func startMonitoring(folderPath: String) {43-        folderMonitor?.stop()44-        folderMonitor = FolderMonitor(folderPath: folderPath) { [weak self] in45-            Task { @MainActor in46-                self?.scanFolder(path: folderPath)47-            }48-        }49-        folderMonitor?.start()50-        scanFolder(path: folderPath)40+  }41+42+  func startMonitoring(folderPath: String) {43+    folderMonitor?.stop()44+    folderMonitor = FolderMonitor(folderPath: folderPath) { [weak self] in45+      Task { @MainActor in46+        self?.scanFolder(path: folderPath)47+      }5148     }52-    53-    func stopMonitoring() {54-        folderMonitor?.stop()55-        folderMonitor = nil56-    }57-    58-    func scanFolder(path: String) {59-        guard !isLoading else { return }60-        isLoading = true61-        errorMessage = nil62-        63-        Task.detached(priority: .userInitiated) { [weak self] in64-            guard let self = self else { return }65-            66-            let folderURL = URL(fileURLWithPath: path)67-            let fileManager = FileManager.default49+    folderMonitor?.start()50+    scanFolder(path: folderPath)51+  }6852 69-            // Create the save folder on first use so a fresh install shows an70-            // empty gallery instead of a scan error.71-            try? fileManager.createDirectory(at: folderURL, withIntermediateDirectories: true)53+  func stopMonitoring() {54+    folderMonitor?.stop()55+    folderMonitor = nil56+  }7257 73-            do {74-                let contents = try fileManager.contentsOfDirectory(75-                    at: folderURL,76-                    includingPropertiesForKeys: [.contentTypeKey, .fileSizeKey, .creationDateKey, .contentModificationDateKey],77-                    options: [.skipsHiddenFiles, .skipsPackageDescendants]78-                )79-                80-                var wallpapers: [LocalWallpaper] = []81-                for url in contents {82-                    let ext = url.pathExtension.lowercased()83-                    guard self.imageExtensions.contains(ext) else { continue }84-                    85-                    do {86-                        let resourceValues = try url.resourceValues(forKeys: [87-                            .fileSizeKey,88-                            .creationDateKey,89-                            .contentModificationDateKey90-                        ])58+  func scanFolder(path: String) {59+    guard !isLoading else { return }60+    isLoading = true61+    errorMessage = nil9162 92-                        // Skip anything we can't actually decode — a broken or93-                        // unsupported file has no readable pixel dimensions, and94-                        // the user would rather it never appear in the gallery.95-                        guard let resolution = Self.imageResolution(url: url) else { continue }63+    Task.detached(priority: .userInitiated) { [weak self] in64+      guard let self = self else { return }9665 97-                        let filename = url.lastPathComponent98-                        let fileSize = Int64(resourceValues.fileSize ?? 0)99-                        let createdAt = resourceValues.creationDate ?? Date()100-                        let modifiedAt = resourceValues.contentModificationDate ?? Date()66+      let folderURL = URL(fileURLWithPath: path)67+      let fileManager = FileManager.default10168 102-                        wallpapers.append(LocalWallpaper(103-                            id: url.path,104-                            url: url,105-                            filename: filename,106-                            resolution: resolution,107-                            fileSize: fileSize,108-                            createdAt: createdAt,109-                            modifiedAt: modifiedAt110-                        ))111-                    } catch {112-                        continue113-                    }114-                }115-                116-                wallpapers.sort { $0.modifiedAt > $1.modifiedAt }117-                118-                let finalWallpapers = wallpapers119-                await MainActor.run {120-                    self.wallpapers = finalWallpapers121-                    self.isLoading = false122-                }123-            } catch {124-                await MainActor.run {125-                    self.errorMessage = "Failed to scan folder: \(error.localizedDescription)"126-                    self.isLoading = false127-                }128-            }69+      // Create the save folder on first use so a fresh install shows an70+      // empty gallery instead of a scan error.71+      try? fileManager.createDirectory(at: folderURL, withIntermediateDirectories: true)72+73+      do {74+        let contents = try fileManager.contentsOfDirectory(75+          at: folderURL,76+          includingPropertiesForKeys: [77+            .contentTypeKey, .fileSizeKey, .creationDateKey, .contentModificationDateKey,78+          ],79+          options: [.skipsHiddenFiles, .skipsPackageDescendants]80+        )81+82+        var wallpapers: [LocalWallpaper] = []83+        for url in contents {84+          let ext = url.pathExtension.lowercased()85+          guard self.imageExtensions.contains(ext) else { continue }86+          if let wallpaper = Self.wallpaper(at: url) { wallpapers.append(wallpaper) }12987         }130-    }131-    132-    /// Reads pixel dimensions without decoding the full image. Returns nil when133-    /// the file can't be read as an image, which is the signal to skip it.134-    /// Nonisolated so scans run entirely off the main actor.135-    nonisolated private static func imageResolution(url: URL) -> String? {136-        guard let imageSource = CGImageSourceCreateWithURL(url as CFURL, nil),137-              let properties = CGImageSourceCopyPropertiesAtIndex(imageSource, 0, nil) as? [String: Any],138-              let width = properties[kCGImagePropertyPixelWidth as String] as? NSNumber,139-              let height = properties[kCGImagePropertyPixelHeight as String] as? NSNumber,140-              width.intValue > 0, height.intValue > 0 else {141-            return nil88+89+        wallpapers.sort { $0.modifiedAt > $1.modifiedAt }90+91+        let finalWallpapers = wallpapers92+        await MainActor.run {93+          self.wallpapers = finalWallpapers94+          self.isLoading = false14295         }143-        return "\(width.intValue)x\(height.intValue)"144-    }145-    146-    func deleteWallpaper(_ wallpaper: LocalWallpaper) {147-        do {148-            try FileManager.default.removeItem(at: wallpaper.url)149-            wallpapers.removeAll { $0.id == wallpaper.id }150-        } catch {151-            errorMessage = "Failed to delete: \(error.localizedDescription)"96+      } catch {97+        await MainActor.run {98+          self.errorMessage = "Failed to scan folder: \(error.localizedDescription)"99+          self.isLoading = false152100         }101+      }153102     }103+  }104+105+  /// Reads pixel dimensions without decoding the full image. Returns nil when106+  /// the file can't be read as an image, which is the signal to skip it.107+  /// Nonisolated so scans run entirely off the main actor.108+  nonisolated private static func imageResolution(url: URL) -> String? {109+    guard let imageSource = CGImageSourceCreateWithURL(url as CFURL, nil),110+      let properties = CGImageSourceCopyPropertiesAtIndex(imageSource, 0, nil) as? [String: Any],111+      let width = properties[kCGImagePropertyPixelWidth as String] as? NSNumber,112+      let height = properties[kCGImagePropertyPixelHeight as String] as? NSNumber,113+      width.intValue > 0, height.intValue > 0114+    else {115+      return nil116+    }117+    return "\(width.intValue)x\(height.intValue)"118+  }119+120+  nonisolated static func wallpaper(at url: URL) -> LocalWallpaper? {121+    guard122+      let resourceValues = try? url.resourceValues(forKeys: [123+        .fileSizeKey, .creationDateKey, .contentModificationDateKey,124+      ]),125+      let resolution = imageResolution(url: url)126+    else { return nil }127+    return LocalWallpaper(128+      id: url.path, url: url, filename: url.lastPathComponent, resolution: resolution,129+      fileSize: Int64(resourceValues.fileSize ?? 0),130+      createdAt: resourceValues.creationDate ?? Date(),131+      modifiedAt: resourceValues.contentModificationDate ?? Date())132+  }133+134+  func deleteWallpaper(_ wallpaper: LocalWallpaper) {135+    do {136+      try FileManager.default.removeItem(at: wallpaper.url)137+      wallpapers.removeAll { $0.id == wallpaper.id }138+    } catch {139+      errorMessage = "Failed to delete: \(error.localizedDescription)"140+    }141+  }154142 }155143 156144 // MARK: - Folder Monitor157145 158-private class FolderMonitor {159-    private let folderPath: String160-    private let callback: () -> Void161-    private var fileDescriptor: Int32 = -1162-    private var source: DispatchSourceFileSystemObject?163-    private let queue = DispatchQueue(label: "com.haven.folderMonitor", qos: .utility)164-    165-    init(folderPath: String, callback: @escaping () -> Void) {166-        self.folderPath = folderPath167-        self.callback = callback146+class FolderMonitor {147+  private let folderPath: String148+  private let callback: () -> Void149+  private var fileDescriptor: Int32 = -1150+  private var source: DispatchSourceFileSystemObject?151+  private let queue = DispatchQueue(label: "com.haven.folderMonitor", qos: .utility)152+153+  init(folderPath: String, fileDescriptor: Int32 = -1, callback: @escaping () -> Void) {154+    self.folderPath = folderPath155+    self.fileDescriptor = fileDescriptor156+    self.callback = callback157+  }158+159+  func start() {160+    fileDescriptor = open(folderPath, O_EVTONLY)161+    guard fileDescriptor >= 0 else { return }162+163+    source = DispatchSource.makeFileSystemObjectSource(164+      fileDescriptor: fileDescriptor,165+      eventMask: [.write, .rename, .delete, .link],166+      queue: queue167+    )168+169+    source?.setEventHandler { [weak self] in170+      DispatchQueue.main.async {171+        self?.callback()172+      }168173     }169-    170-    func start() {171-        fileDescriptor = open(folderPath, O_EVTONLY)172-        guard fileDescriptor >= 0 else { return }173-        174-        source = DispatchSource.makeFileSystemObjectSource(175-            fileDescriptor: fileDescriptor,176-            eventMask: [.write, .rename, .delete, .link],177-            queue: queue178-        )179-        180-        source?.setEventHandler { [weak self] in181-            DispatchQueue.main.async {182-                self?.callback()183-            }184-        }185-        186-        source?.setCancelHandler { [weak self] in187-            guard let self = self else { return }188-            close(self.fileDescriptor)189-        }190-        191-        source?.resume()192-    }193-    194-    func stop() {195-        source?.cancel()196-        source = nil197-    }198-    199-    deinit {200-        stop()201-    }174+175+    source?.setCancelHandler { [weak self] in self?.closeFileDescriptor() }176+177+    source?.resume()178+  }179+180+  func stop() {181+    source?.cancel()182+    source = nil183+  }184+185+  func closeFileDescriptor() {186+    guard fileDescriptor >= 0 else { return }187+    close(fileDescriptor)188+    fileDescriptor = -1189+  }190+191+  deinit {192+    stop()193+  }202194 }