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.

Forgetting refusals deletes the file and never a folder in its place

Țugui Dragoșb7925ffe0a71
diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/RefusalLog.swift b/Packages/PeelCore/Sources/PeelCore/Removal/RefusalLog.swift
index 87988644..e532e641 100644
--- a/Packages/PeelCore/Sources/PeelCore/Removal/RefusalLog.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Removal/RefusalLog.swift
@@ -82,10 +82,10 @@ public actor RefusalLog {
}
}
+ /// Deletes the file for good, so `unlink`, which never takes a folder put in its place.
public func clear() -> Bool {
FileLock.whileHeld(beside: url) {
- guard !url.isMissing else { return true }
- return (try? FileManager.default.removeItem(at: url)) != nil
+ url.isMissing || unlink(url.path(percentEncoded: false)) == 0
}
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/RefusalLogTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/RefusalLogTests.swift
index 3cd9721b..06a9779d 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/RefusalLogTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/RefusalLogTests.swift
@@ -176,6 +176,16 @@ struct RefusalLogTests {
#expect(await log.clear(), "forgetting what is already forgotten is no failure")
}
+ /// Forgetting refusals deletes for good, so it takes the file and never a folder put in its place.
+ @Test func clearNeverDeletesAFolderInThePlaceOfTheFile() async throws {
+ let directory = try TemporaryDirectory()
+ let url = directory.url.appending(path: "Peel/refusals.json")
+ try directory.file("Peel/refusals.json/kept.txt", contents: Data("work".utf8))
+
+ #expect(await RefusalLog(url: url).clear() == false)
+ #expect(FileManager.default.fileExists(atPath: url.appending(path: "kept.txt").path(percentEncoded: false)))
+ }
+
private static let everyReason: [TrashFailure.Reason] = [
.guarded(nil), .changedSinceScan, .claimedSinceScan, .lastCopy, .notPermitted, .needsHelper,
.movedWithoutATrace, .somethingElseMoved(named: "x 2"), .historyUnreadable,