Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.
Swift cache-cleanercleanerclideveloper-toolsdisk-cleanupdisk-spaceduplicate-finderhomebrewliquid-glassmac-cleanermacosmacos-appmacos-golden-gatemacos-tahoemacos-tweaksswiftswiftuiterminal-themesuninstalluninstaller
Say a folder is locked when Put Back reaches it through a link
Țugui Dragoșfba443cc6d1a
diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/TrashService.swift b/Packages/PeelCore/Sources/PeelCore/Removal/TrashService.swiftindex c199a237..91540e10 100644--- a/Packages/PeelCore/Sources/PeelCore/Removal/TrashService.swift+++ b/Packages/PeelCore/Sources/PeelCore/Removal/TrashService.swift@@ -803,14 +803,15 @@ public struct TrashService: Sendable {return nil}- /// The nearest folder on `item`'s way back that exists, which its Put Back writes into: missing folders are made- /// again.+ /// The nearest folder on `item`'s way back that exists, as the kernel names it, which its Put Back writes into:+ /// missing folders are made again.static func folder(puttingBack item: TrashedItem) -> String {- var ancestor = item.originalURL.deletingLastPathComponent().path(percentEncoded: false)- while !FileManager.default.fileExists(atPath: ancestor), ancestor != "/" {- ancestor = (ancestor as NSString).deletingLastPathComponent+ var nearest = item.originalURL.deletingLastPathComponent().path(percentEncoded: false)+ while nearest != "/", !nearest.isEmpty {+ if let resolved = PrivilegedPathPolicy.resolvedPath(nearest) { return resolved }+ nearest = (nearest as NSString).deletingLastPathComponent}- return ancestor+ return "/"}/// Whether the folder `item` goes back into is gone, which the helper doesn't make again. A folder this processdiff --git a/Packages/PeelCore/Tests/PeelCoreTests/TrashServiceTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/TrashServiceTests.swiftindex 5c27ff26..08ff5ed7 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/TrashServiceTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/TrashServiceTests.swift@@ -643,6 +643,31 @@ struct TrashServiceTests {#expect(lockedFolder == .folderLocked)}+ @Test func aFolderLockedBehindALinkOnTheWayBackIsSaidSo() async throws {+ let directory = try TemporaryDirectory()+ let documents = try directory.directory("home/Documents")+ let link = directory.url.appending(path: "home/Linked")+ try FileManager.default.createSymbolicLink(at: link, withDestinationURL: documents)+ let trashed = try directory.file("home/.Trash/letter.txt", bytes: 1)+ let service = TrashService(+ environment: SearchEnvironment(+ homeDirectory: directory.url.appending(path: "home"),+ rootDirectory: directory.url.appending(path: "root")+ )+ ) { $0 }+ let item = TrashedItem(originalURL: link.appending(path: "letter.txt"), trashedURL: trashed, date: .now)+ let deeper = TrashedItem(originalURL: link.appending(path: "Gone/letter.txt"), trashedURL: trashed, date: .now)+ let path = documents.path(percentEncoded: false)+ try FileManager.default.setAttributes([.immutable: true], ofItemAtPath: path)+ defer { try? FileManager.default.setAttributes([.immutable: false], ofItemAtPath: path) }++ let intoTheFolder = await service.restore(item)+ let belowIt = await service.restore(deeper)++ #expect(intoTheFolder == .folderLocked)+ #expect(belowIt == .folderLocked)+ }+@Test(.permissionsHold) func saysWhenTheFolderAnItemGoesBackToIsGoneAndOnlyTheHelperCouldMakeIt() throws {let directory = try TemporaryDirectory()let support = try directory.directory("root/Library/Application Support")