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
Keep the rule of an app that isn't the package's to its own folder
Țugui Dragoșb35a62c7aada
diff --git a/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipts.swift b/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipts.swiftindex 409a0dde..4e10d2b3 100644--- a/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipts.swift+++ b/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipts.swift@@ -341,7 +341,8 @@ public enum PackageReceipts {let removed = RemovedElsewhere.of(app, installedSystemExtensions: carried)removedApps[PathPattern.comparablePath(of: app.url)] = removed}- let removedWithItsApp = apps.lazy.compactMap { removedApps[PathPattern.comparablePath(of: $0.url)] }.first+ let rule = { (app: InstalledApp) in removedApps[PathPattern.comparablePath(of: app.url)] }+ let removedWithItsApp = ownApps.lazy.compactMap(rule).firstlet uninstallers = apps.compactMap { UninstallsItself.of($0, environment: environment) }let uninstaller = uninstallers.firstvar items: [PackageReceipt.Item] = []@@ -376,7 +377,9 @@ public enum PackageReceipts {refusal: removalGuard.refusal(of: url),heldBack: heldBack,removedElsewhere: url.pathExtension.caseInsensitiveCompare("app") == .orderedSame- ? removedApps[place] : removedWithItsApp,+ ? removedApps[place]+ : apps.lazy.filter { PathComponents.isPath(PathPattern.comparablePath(of: $0.url), inside: place) }+ .compactMap(rule).first ?? removedWithItsApp,uninstallsItself: uninstallers.first {PathComponents.isPath(PathPattern.comparablePath(of: $0.app.url), atOrInside: place)}diff --git a/Packages/PeelCore/Tests/PeelCoreTests/PackageReceiptsTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/PackageReceiptsTests.swiftindex b07170df..cba94eaa 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/PackageReceiptsTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/PackageReceiptsTests.swift@@ -518,6 +518,50 @@ struct PackageReceiptsTests {#expect(scan.receipts.first?.installedApps == [])}+ @Test func anAppInAFolderOthersFilledLeavesTheRestOfThePackageAlone() async throws {+ let directory = try TemporaryDirectory()+ let volume = PathPattern.canonical(directory.url)+ func info(_ identifier: String, _ name: String) throws -> Data {+ try PropertyListSerialization.data(+ fromPropertyList: ["CFBundleIdentifier": identifier, "CFBundleName": name], format: .xml, options: 0+ )+ }+ try directory.file("Applications/Vendor/Guard.app/Contents/Info.plist", contents: info("org.example.guard", "Guard"))+ try directory.file(+ "Applications/Vendor/Guard.app/Contents/Library/SystemExtensions/org.example.guard.filter.systemextension/Contents/Info.plist",+ contents: info("org.example.guard.filter", "Guard Filter")+ )+ try directory.file("Library/Application Support/Vendor/settings.json", bytes: 16)+ let pkgutil: PackageReceipts.Pkgutil = { arguments in+ switch arguments.first {+ case "--pkgs-plist":+ return PkgutilAnswer.packages("org.example.vendor.pkg")+ case "--pkg-info-plist":+ let info = ["volume": volume.path(percentEncoded: false), "install-location": "/"]+ let data = try? PropertyListSerialization.data(fromPropertyList: info, format: .xml, options: 0)+ return data.flatMap { String(data: $0, encoding: .utf8) }+ case "--files":+ return "Applications/Vendor\nLibrary/Application Support/Vendor\nLibrary/Application Support/Vendor/settings.json\n"+ default:+ return nil+ }+ }+ let filter = AppExtension(+ identifier: "org.example.guard.filter", name: "Guard Filter", kind: .systemExtension, point: nil, owner: nil,+ url: nil, election: .on, teamIdentifier: nil, reportedState: nil+ )+ let environment = SearchEnvironment(homeDirectory: volume.appending(path: "home"), rootDirectory: volume)++ let scan = await PackageReceipts.list(+ exclusions: .none, pkgutil: pkgutil, environment: environment, systemExtensions: { [filter] }+ )++ let items = try #require(scan.receipts.first?.items)+ let isInApplications = { (item: PackageReceipt.Item) in item.url.path(percentEncoded: false).contains("Applications/") }+ #expect(items.first(where: isInApplications)?.removedElsewhere != nil)+ #expect(items.first { !isInApplications($0) }?.removedElsewhere == nil)+ }+@Test(.permissionsHold) func whatTheAccountCannotReachIsNotGone() async throws {let directory = try TemporaryDirectory()let volume = PathPattern.canonical(directory.url)