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.

Stop listing package receipts once their scan is stopped

Țugui Dragoș58bc3895d9d8
diff --git a/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipts.swift b/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipts.swift
index 70de0d8b..8d3be9bc 100644
--- a/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipts.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipts.swift
@@ -99,7 +99,8 @@ public enum PackageReceipts {
}
while let result = await group.next() {
results.append(result)
- if let identifier = pending.next() {
+ // A stopped scan starts no other package: each would ask `pkgutil` for nothing.
+ if !Task.isCancelled, let identifier = pending.next() {
group.addTask {
await Self.receipt(
identifier,
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/PackageReceiptsTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/PackageReceiptsTests.swift
index 590adfa5..ab84b99c 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/PackageReceiptsTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/PackageReceiptsTests.swift
@@ -244,6 +244,30 @@ struct PackageReceiptsTests {
#expect(items.sorted() == ["Example.plugin", "Vendor Node/One/vendor-node", "org.example/Driver"])
}
+ @Test func aStoppedListStops() async throws {
+ let directory = try TemporaryDirectory()
+ let environment = SearchEnvironment(
+ homeDirectory: directory.url.appending(path: "home"), rootDirectory: directory.url
+ )
+ let unanswered = Unanswered()
+ let packages = PkgutilAnswer.packages(
+ "org.example.one", "org.example.two", "org.example.three", "org.example.four", "org.example.five",
+ "org.example.six", "org.example.seven", "org.example.eight", "org.example.nine", "org.example.ten"
+ )
+ let pkgutil: PackageReceipts.Pkgutil = { arguments in
+ if arguments.first == "--pkgs-plist" { return packages }
+ return await unanswered.pkgutil(arguments)
+ }
+
+ let stop = try await unanswered.stop {
+ _ = await PackageReceipts.list(exclusions: .none, pkgutil: pkgutil, environment: environment)
+ }
+
+ #expect(stop.took < .seconds(1))
+ #expect(stop.askedBefore < 10)
+ #expect(stop.askedAfter == 0)
+ }
+
@Test func aPackageWhoseScriptsPlaceItsFilesIsNeverReceiptOnly() async throws {
let directory = try TemporaryDirectory()
let volume = PathPattern.canonical(directory.url)
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/Unanswered.swift b/Packages/PeelCore/Tests/PeelCoreTests/Unanswered.swift
index 11235a4b..47ce29a2 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/Unanswered.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/Unanswered.swift
@@ -33,6 +33,13 @@ final class Unanswered: Sendable {
}
}
+ var pkgutil: PackageReceipts.Pkgutil {
+ { [self] _ in
+ await wait()
+ return nil
+ }
+ }
+
private func wait() async {
asked.withLock { $0 += 1 }
try? await Task.sleep(for: .seconds(3_600))