Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Let the first reading of the apps finish

Țugui Dragoș568c176ea51c
diff --git a/Peel/Model/AppLibrary.swift b/Peel/Model/AppLibrary.swift
index faa63049..1229293f 100644
--- a/Peel/Model/AppLibrary.swift
+++ b/Peel/Model/AppLibrary.swift
@@ -177,6 +177,7 @@ final class AppLibrary {
/// finish last with a list that lacks an app installed in between.
let scanRun = ScanRun()
private var lastRead: ContinuousClock.Instant?
+ @ObservationIgnored private var firstReading: Task<Void, Never>?
private let updateChecker: UpdateChecker
private let teamRegistry = TeamRegistry()
@@ -231,9 +232,16 @@ final class AppLibrary {
Listing(revision: revision, unreadable: unreadable, listOfFoldersUnreadable: listOfFoldersUnreadable)
}
- /// The first reading of the folders, at launch. A reading the folder watch starts meanwhile takes its place
- /// and lists the apps itself.
+ /// The first reading of the folders, at launch. A reading asked for meanwhile, as when the folder watch hears of a
+ /// change, waits for this one, which alone puts back what earlier runs learned.
func load() async {
+ let reading = Task { await readFirst() }
+ firstReading = reading
+ await reading.value
+ firstReading = nil
+ }
+
+ private func readFirst() async {
isLoading = true
lastRead = .now
if !hasLoaded {
@@ -303,6 +311,7 @@ final class AppLibrary {
/// when it was last checked) is dropped rather than shown for a version it doesn't describe.
@discardableResult
func refresh() async -> [InstalledApp] {
+ await firstReading?.value
lastRead = .now
let changes = folderChanges
let read = await scanRun.run { [appFolders] in await AppCatalog.scan(choices: appFolders) }
diff --git a/PeelTests/UpdateRoundTests.swift b/PeelTests/UpdateRoundTests.swift
index 56b4d7ca..0e654e39 100644
--- a/PeelTests/UpdateRoundTests.swift
+++ b/PeelTests/UpdateRoundTests.swift
@@ -79,6 +79,38 @@ private nonisolated final class TransportProtocol: URLProtocol, @unchecked Senda
#expect(known != nil && remembered == known, "nothing learned, nothing put off")
}
+ @Test func aReadingAskedForDuringTheFirstLeavesWhatEarlierRunsLearned() async throws {
+ let folder = FileManager.default.temporaryDirectory.appending(path: "PeelTests-\(UUID().uuidString)")
+ defer { try? FileManager.default.removeItem(at: folder) }
+ let made = try MadeUpDefaults()
+ defer { made.forget() }
+ let chosen = folder.appending(path: "Chosen", directoryHint: .isDirectory)
+ let bundle = try app("Saved", in: chosen, feed: "https://one.example.com/appcast.xml")
+ TransportProtocol.answering.withLock { $0 = ["one.example.com"] }
+ let earlier = library(made.defaults, notesIn: folder)
+ #expect(await earlier.reveal([bundle]))
+ await earlier.checkForUpdates(earlier.apps.filter { $0.bundleIdentifier == "org.example.saved" }, force: true)
+
+ let configuration = URLSessionConfiguration.ephemeral
+ configuration.protocolClasses = [TransportProtocol.self]
+ let library = AppLibrary(
+ defaults: made.defaults,
+ updateChecker: UpdateChecker(session: URLSession(configuration: configuration)),
+ releaseNotesStore: ReleaseNotesStore(url: folder.appending(path: "release-notes.json")),
+ appFolders: AppFolders(url: folder.appending(path: "app-folders.json")),
+ appMemory: AppMemory(url: folder.appending(path: "apps.json"))
+ )
+ library.addFolders([chosen])
+
+ let first = Task { await library.load() }
+ while !library.scanRun.isRunning { await Task.yield() }
+ await library.refresh()
+ await first.value
+
+ let saved = try #require(library.apps.first { $0.bundleIdentifier == "org.example.saved" })
+ #expect(library.shownUpdateStatus(of: saved) == .upToDate)
+ }
+
@Test func aFeedThatReachesNoServerFailsWhileAnotherAnswers() async throws {
let folder = FileManager.default.temporaryDirectory.appending(path: "PeelTests-\(UUID().uuidString)")
defer { try? FileManager.default.removeItem(at: folder) }