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
Installers and Backups leaves alone what the helper would refuse
Țugui Dragoșc14ea4f216da
diff --git a/Packages/PeelCore/Sources/PeelCore/Space/Installers.swift b/Packages/PeelCore/Sources/PeelCore/Space/Installers.swiftindex 9fc21576..ff88d06b 100644--- a/Packages/PeelCore/Sources/PeelCore/Space/Installers.swift+++ b/Packages/PeelCore/Sources/PeelCore/Space/Installers.swift@@ -22,7 +22,8 @@ public struct InstallerItem: Sendable, Hashable, Identifiable {public let isReadOnly: Boolpublic let notes: [Note]/// True when moving the item needs administrator access, so the move goes through the helper. A macOS- /// installer that Software Update downloaded is one: it belongs to root.+ /// installer that Software Update downloaded is one: it belongs to root. One the helper would refuse is held+ /// back as `beyondTheHelper`.public var requiresPrivileges = false/// Why the item is left for the person to choose, from what measuring it saw: it was not measured or not read,/// or a wallet or a repository is inside.@@ -130,6 +131,15 @@ public enum Installers {}if readable == .missing { unreadable.append(backupFolder) }+ let reach = HelperReach(environment: SearchEnvironment(homeDirectory: home, rootDirectory: root))+ items = items.map { item in+ guard item.requiresPrivileges, item.heldBack?.cannotBeMoved != true, reach.isBeyond(item.url) else {+ return item+ }+ var item = item+ item.heldBack = .beyondTheHelper+ return item+ }return InstallerScan(// An unknown size sorts first: an item that ran out of time is most likely one of the biggest.items: items.sorted { ($0.size ?? .max) > ($1.size ?? .max) },@@ -310,6 +320,7 @@ public enum Installers {installedApp: nil,isReadOnly: false,notes: [],+ requiresPrivileges: FileAccess.requiresPrivilegesToRemove(url),heldBack: heldBack)}diff --git a/Packages/PeelCore/Tests/PeelCoreTests/InstallersTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/InstallersTests.swiftindex 1991fa4e..2b675630 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/InstallersTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/InstallersTests.swift@@ -188,6 +188,32 @@ struct InstallersTests {#expect(heldBack["Other-3.dmg"] == .some(nil))}+ /// An item only an administrator can move goes through the helper, which takes a macOS installer from+ /// Applications and anything in the home's Library, and nothing else in the home folder. One it would refuse+ /// cannot be selected at all.+ @Test(.permissionsHold) func leavesAloneWhatTheHelperWouldRefuse() async throws {+ let directory = try TemporaryDirectory()+ try directory.file("home/Downloads/Tool-1.dmg", bytes: 400_000)+ try directory.file("home/Library/iTunes/iPhone Software Updates/iPhone17,1_26.1.ipsw", bytes: 400_000)+ try directory.file("root/Applications/Install macOS Tahoe.app/Contents/MacOS/app", bytes: 400_000)+ let locked = ["home/Downloads", "home/Library/iTunes/iPhone Software Updates", "root/Applications"]+ for folder in locked { try directory.setPermissions(0o555, of: folder) }+ defer { for folder in locked { try? directory.setPermissions(0o755, of: folder) } }++ let scan = await Installers.scan(+ installedApps: [],+ home: directory.url.appending(path: "home", directoryHint: .isDirectory),+ root: directory.url.appending(path: "root", directoryHint: .isDirectory),+ minimumSize: 100_000+ )++ let items = Dictionary(uniqueKeysWithValues: scan.items.map { ($0.name, $0) })+ #expect(items.values.allSatisfy { $0.requiresPrivileges })+ #expect(items["Tool-1.dmg"]?.heldBack == .beyondTheHelper)+ #expect(items["iPhone17,1_26.1.ipsw"]?.heldBack == .some(nil))+ #expect(items["Install macOS Tahoe"]?.heldBack == .some(nil))+ }+@Test func findsMacOSInstallersAndDeviceFirmware() async throws {let directory = try TemporaryDirectory()try directory.file("Applications/Install macOS Tahoe.app/Contents/MacOS/app", bytes: 400_000)diff --git a/Peel/Model/InstallerLibrary.swift b/Peel/Model/InstallerLibrary.swiftindex 40d23c06..405fc3ed 100644--- a/Peel/Model/InstallerLibrary.swift+++ b/Peel/Model/InstallerLibrary.swift@@ -27,7 +27,7 @@ final class InstallerLibrary {func refresh(installedApps: [InstalledApp]) async {guard let result = await scanRun.run({ await Installers.scan(installedApps: installedApps, exclusions: ExclusionsStore.shared.exclusions) }) else { return }scan = result- selectedURLs.formIntersection(Set(result.items.map(\.url)))+ selectedURLs.formIntersection(Set(result.items.filter { $0.heldBack?.cannotBeMoved != true }.map(\.url)))if let selection, result.items(in: selection).isEmpty {self.selection = nil}diff --git a/Peel/Views/Installers/InstallerDetailView.swift b/Peel/Views/Installers/InstallerDetailView.swiftindex 4fee22d3..634f4a82 100644--- a/Peel/Views/Installers/InstallerDetailView.swift+++ b/Peel/Views/Installers/InstallerDetailView.swift@@ -16,7 +16,7 @@ struct InstallerDetailView: View {.listRowSeparator(.hidden)RemovalsHeldBanner()- if rows.contains(where: \.requiresPrivileges), !helper.canAct {+ if rows.contains(where: { $0.requiresPrivileges && $0.heldBack?.cannotBeMoved != true }), !helper.canAct {HelperRequiredBanner()}@@ -33,6 +33,7 @@ struct InstallerDetailView: View {size: item.size ?? 0,isMeasured: item.size != nil,isLocked: item.requiresPrivileges && !helper.canAct,+ isLeftAlone: item.heldBack?.cannotBeMoved == true,isFirst: item.id == rows.first?.id,hasNoteColumn: hasNoteColumn,selection: installers, isSelected: installers.isSelected(item.url)