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
Read the package receipts again when one changed elsewhere
Țugui Dragoș7016f2ee298f
diff --git a/Packages/PeelCore/Sources/PeelCore/Packages/PackageActions.swift b/Packages/PeelCore/Sources/PeelCore/Packages/PackageActions.swiftindex 1a99c3ff..7f887c83 100644--- a/Packages/PeelCore/Sources/PeelCore/Packages/PackageActions.swift+++ b/Packages/PeelCore/Sources/PeelCore/Packages/PackageActions.swift@@ -1,4 +1,4 @@-import Foundation+public import Foundationpublic enum PackageActions {static let misplacedReceipt = "The receipt isn’t where macOS keeps receipts."@@ -13,6 +13,25 @@ public enum PackageActions {.filter(\.isThere).map(PathPattern.spelledOnDisk)}+ /// When a receipt on `volume` last changed: the newest date of the folder macOS keeps them in and of what is in it.+ /// Writing, forgetting, or putting back a receipt changes the folder's; an upgrade rewrites a receipt in place,+ /// which changes only the file's. Nil when the folder can't be read.+ public static func receiptsChanged(+ onVolume volume: URL = URL(filePath: "/", directoryHint: .isDirectory)+ ) -> Date? {+ let folder = receiptsFolder(onVolume: volume)+ let path = folder.path(percentEncoded: false)+ guard let names = try? FileManager.default.contentsOfDirectory(atPath: path) else { return nil }+ return ([folder] + names.map { folder.appending(path: $0) }).compactMap(modified).max()+ }++ private static func modified(_ url: URL) -> Date? {+ var info = stat()+ guard lstat(url.path(percentEncoded: false), &info) == 0 else { return nil }+ let time = info.st_mtimespec+ return Date(timeIntervalSince1970: TimeInterval(time.tv_sec) + TimeInterval(time.tv_nsec) / 1_000_000_000)+ }+private static func receiptsFolder(onVolume volume: URL) -> URL {volume.appending(path: "private/var/db/receipts", directoryHint: .isDirectory)}diff --git a/Packages/PeelCore/Tests/PeelCoreTests/PackageActionsTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/PackageActionsTests.swiftindex 3f96d8a7..07f372df 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/PackageActionsTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/PackageActionsTests.swift@@ -15,6 +15,26 @@ struct PackageActionsTests {)}+ @Test func knowsWhenAReceiptChanged() throws {+ let directory = try TemporaryDirectory()+ let folder = try directory.directory("private/var/db/receipts")+ let receipt = try directory.file("private/var/db/receipts/org.example.pkg.plist", bytes: 16)+ let written = Date(timeIntervalSince1970: 1_790_000_000)+ func date(_ date: Date, of item: URL) throws {+ let path = item.path(percentEncoded: false)+ try FileManager.default.setAttributes([.modificationDate: date], ofItemAtPath: path)+ }+ try date(written, of: folder)+ try date(written, of: receipt)++ #expect(PackageActions.receiptsChanged(onVolume: directory.url) == written)+ // An upgrade rewrites a receipt in place, which leaves the folder's own date as it was.+ let upgraded = written + 3_600+ try date(upgraded, of: receipt)+ #expect(PackageActions.receiptsChanged(onVolume: directory.url) == upgraded)+ #expect(PackageActions.receiptsChanged(onVolume: directory.url.appending(path: "elsewhere")) == nil)+ }+@Test func aReceiptIsItsTwoFiles() throws {let directory = try TemporaryDirectory()try directory.file("private/var/db/receipts/com.example.tool.bom")diff --git a/Peel/Model/PackageLibrary.swift b/Peel/Model/PackageLibrary.swiftindex 6f017f4e..f1747f85 100644--- a/Peel/Model/PackageLibrary.swift+++ b/Peel/Model/PackageLibrary.swift@@ -13,6 +13,9 @@ final class PackageLibrary {private(set) var isWorking = falsevar selection: PackageReceipt.ID?var selectedURLs: Set<URL> = []+ /// When a receipt last changed as the last scan began, so a receipt written, forgotten, or put back elsewhere since+ /// is noticed: on an app's page, by an uninstall, from History, or by an installer.+ private var scannedChange: Date?var selectedReceipt: PackageReceipt? {receipts?.first { $0.id == selection }@@ -30,9 +33,11 @@ final class PackageLibrary {}func refresh() async {+ let change = PackageActions.receiptsChanged()guardlet scan = await scanRun.run({ await PackageReceipts.list(exclusions: ExclusionsStore.shared.exclusions) })else { return }+ scannedChange = changelet result = scan.receiptsreceipts = resultcouldNotAsk = scan.couldNotAsk@@ -42,6 +47,13 @@ final class PackageLibrary {}}+ /// Reads the receipts again when one changed since the last scan.+ func refreshIfReceiptsChanged() async {+ guard receipts != nil, !isScanning, !isWorking else { return }+ guard PackageActions.receiptsChanged() != scannedChange else { return }+ await refresh()+ }+func removeSelectedItems(recording record: (TrashResult) async -> Void) async -> TrashResult {isWorking = truedefer { isWorking = false }diff --git a/Peel/Views/Packages/PackageList.swift b/Peel/Views/Packages/PackageList.swiftindex b505a24f..7a8d5e2c 100644--- a/Peel/Views/Packages/PackageList.swift+++ b/Peel/Views/Packages/PackageList.swift@@ -3,6 +3,7 @@ import SwiftUIstruct PackageList: View {@Environment(PackageLibrary.self) private var packages+ @Environment(RemovalHistoryStore.self) private var history@State private var searchText = ""@State private var isRescanning = false@@ -74,9 +75,19 @@ struct PackageList: View {}}.task {- guard packages.receipts == nil, !packages.isScanning, !packages.scanRun.wasStopped else { return }+ guard packages.receipts == nil else {+ await packages.refreshIfReceiptsChanged()+ return+ }+ guard !packages.isScanning, !packages.scanRun.wasStopped else { return }await packages.refresh()}+ .onReceive(NotificationCenter.default.publisher(for: NSApplication.didBecomeActiveNotification)) { _ in+ Task { await packages.refreshIfReceiptsChanged() }+ }+ .onChange(of: history.revision) {+ Task { await packages.refreshIfReceiptsChanged() }+ }.rescanOnExclusionChange("PackageList") { await packages.refresh() }.rescanAfterPutBack(.packages) { await packages.refresh() }}