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
The helper knows what it moved after the disk is numbered again
Țugui Dragoș2147bbcfb2cc
diff --git a/Packages/PeelCore/Sources/PeelPrivileged/HelperLedger.swift b/Packages/PeelCore/Sources/PeelPrivileged/HelperLedger.swiftindex bc923033..e75126e9 100644--- a/Packages/PeelCore/Sources/PeelPrivileged/HelperLedger.swift+++ b/Packages/PeelCore/Sources/PeelPrivileged/HelperLedger.swift@@ -9,8 +9,17 @@ public final class HelperLedger: @unchecked Sendable {private struct Entry: Codable {let path: Stringlet identity: ItemIdentity+ /// The UUID of the volume the item was on. Its device number follows the order volumes mount in, so an+ /// item is known by this and its inode and birth time, and by its device number only when this is missing.+ let volume: String?let user: UInt32let date: Date++ func names(_ other: ItemIdentity, on otherVolume: String?) -> Bool {+ guard identity.inode == other.inode, identity.birth == other.birth else { return false }+ if let volume, let otherVolume { return volume == otherVolume }+ return identity == other+ }}public static let defaultFolder = "/private/var/db/\(HelperIdentity.helperIdentifier)"@@ -41,20 +50,22 @@ public final class HelperLedger: @unchecked Sendable {public func record(_ items: [OpenItem], movedBy user: uid_t) -> Bool {Self.lock.withLock {let added = items.compactMap { item in- item.identity.map { Entry(path: item.path, identity: $0, user: user, date: .now) }+ item.identity.map { identity in+ Entry(path: item.path, identity: identity, volume: Self.volume(of: item), user: user, date: .now)+ }}- let known = Set(added.map(\.identity))guard let entries = read() else { return false }- return write((entries.filter { !known.contains($0.identity) } + added).suffix(maximumEntries))+ let kept = entries.filter { entry in !added.contains { entry.names($0.identity, on: $0.volume) } }+ return write((kept + added).suffix(maximumEntries))}}/// Removes `items` from the ledger: those that did not move after all, and those that were put back.public func forget(_ items: [OpenItem]) {Self.lock.withLock {- let gone = Set(items.compactMap(\.identity))+ let gone = items.compactMap { item in item.identity.map { ($0, Self.volume(of: item)) } }guard !gone.isEmpty, let entries = read() else { return }- _ = write(entries.filter { !gone.contains($0.identity) })+ _ = write(entries.filter { entry in !gone.contains { entry.names($0.0, on: $0.1) } })}}@@ -81,7 +92,16 @@ public final class HelperLedger: @unchecked Sendable {public func origin(of item: OpenItem, movedBy user: uid_t) throws(Unreadable) -> String? {guard let entries = Self.lock.withLock({ read() }) else { throw Unreadable() }guard let identity = item.identity else { return nil }- return entries.last { $0.identity == identity && $0.user == user }?.path+ let volume = Self.volume(of: item)+ return entries.last { $0.names(identity, on: volume) && $0.user == user }?.path+ }++ private static func volume(of item: OpenItem) -> String? {+ var info = statfs()+ guard fstatfs(item.parent.descriptor, &info) == 0 else { return nil }+ let mount = withUnsafeBytes(of: info.f_mntonname) { String(decoding: $0.prefix { $0 != 0 }, as: UTF8.self) }+ let volume = URL(filePath: mount, directoryHint: .isDirectory)+ return (try? volume.resourceValues(forKeys: [.volumeUUIDStringKey]))?.volumeUUIDString}/// The entries, or nil when the ledger is there and cannot be read: then nothing moves and nothing goes back.diff --git a/Packages/PeelCore/Tests/PeelCoreTests/HelperLedgerTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/HelperLedgerTests.swiftindex 631bacb3..5312bc18 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/HelperLedgerTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/HelperLedgerTests.swift@@ -1,5 +1,5 @@import Foundation-import PeelPrivileged+@testable import PeelPrivilegedimport Testing/// Put Back works from a record that any process running as the user can rewrite, so the helper keeps its own@@ -195,6 +195,32 @@ struct HelperLedgerTests {#expect(try Data(contentsOf: url) == before)}+ /// A volume's device number follows the order volumes mount in, so it can change between two starts of the Mac.+ @Test func knowsAnItemAfterItsVolumeIsNumberedAgain() throws {+ let directory = try TemporaryDirectory()+ let policy = try policy(in: directory)+ let ledger = try ledger(in: directory)+ let trash = try #require(policy.openTrash(ownedBy: getuid()))+ let trashedPath = try move("root/Library/Caches/com.example.plist", with: ledger, policy: policy, in: directory)++ let url = directory.url.appending(path: "private/moved.plist")+ let saved = try PropertyListSerialization.propertyList(from: Data(contentsOf: url), format: nil)+ var entries = try #require(saved as? [[String: Any]])+ var identity = try #require(entries[0]["identity"] as? [String: Any])+ identity["device"] = 1+ entries[0]["identity"] = identity+ try PropertyListSerialization.data(fromPropertyList: entries, format: .binary, options: 0).write(to: url)++ let trashed = try #require(policy.openInTrash(trashedPath, trash: trash))+ #expect(try ledger.origin(of: trashed, movedBy: getuid()) != nil, "forgotten once the volume was numbered again")++ identity["device"] = Int(try #require(trashed.identity).device)+ entries[0]["identity"] = identity+ entries[0]["volume"] = nil+ try PropertyListSerialization.data(fromPropertyList: entries, format: .binary, options: 0).write(to: url)+ #expect(try ledger.origin(of: trashed, movedBy: getuid()) != nil, "an entry kept without its volume was forgotten")+ }+@Test func keepsTheNewestEntriesAndOnlyInAFolderOfItsOwn() throws {let directory = try TemporaryDirectory()let policy = try policy(in: directory)