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 judging files once a File Search is stopped

Țugui Dragoș5849b343e9bb
diff --git a/Packages/PeelCore/Sources/PeelCore/Search/FileSearch.swift b/Packages/PeelCore/Sources/PeelCore/Search/FileSearch.swift
index 7cab5b29..2aae73e5 100644
--- a/Packages/PeelCore/Sources/PeelCore/Search/FileSearch.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Search/FileSearch.swift
@@ -207,6 +207,7 @@ public enum FileSearch {
}
var repositories: [String: Bool] = [:]
listing: for candidate in candidates {
+ guard !Task.isCancelled else { return FileSearchResults(didRun: false) }
let url = URL(filePath: candidate.path)
let hasRoom = results.files.count < maximumResults
let judgment = judge(url, info: candidate.info, kind: kind, refusal: refusal, syncKeeper: syncKeeper)
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/FileSearchTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/FileSearchTests.swift
index 66f80839..862d1109 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/FileSearchTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/FileSearchTests.swift
@@ -31,6 +31,28 @@ struct FileSearchTests {
#expect(stop.askedAfter == 0)
}
+ @Test func aStoppedSearchStopsJudgingWhatItFound() async throws {
+ let directory = try TemporaryDirectory()
+ let paths = try (1...5).map { try directory.file("home/file\($0).txt", bytes: 16).path(percentEncoded: false) }
+ let environment = SearchEnvironment(
+ homeDirectory: directory.url.appending(path: "home", directoryHint: .isDirectory),
+ rootDirectory: directory.url
+ )
+ let judged = Mutex(0)
+
+ let searching = Task {
+ FileSearch.results(from: paths, kind: .any, environment: environment, refusal: { _ in
+ judged.withLock { $0 += 1 }
+ withUnsafeCurrentTask { $0?.cancel() }
+ return nil
+ })
+ }
+ let results = await searching.value
+
+ #expect(judged.withLock { $0 } == 1)
+ #expect(!results.didRun)
+ }
+
@Test func anEmptySearchNamesTheDisksSpotlightDoesNotIndex() async throws {
var criteria = FileSearchCriteria()
criteria.name = "report"