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
Count in every page's "to remove" only what can be selected now
Țugui Dragoșc47f0cc8a3fe
diff --git a/Packages/PeelCore/Sources/PeelCore/Orphans/Orphan.swift b/Packages/PeelCore/Sources/PeelCore/Orphans/Orphan.swiftindex f5754cf8..1943afa0 100644--- a/Packages/PeelCore/Sources/PeelCore/Orphans/Orphan.swift+++ b/Packages/PeelCore/Sources/PeelCore/Orphans/Orphan.swift@@ -56,9 +56,11 @@ public struct OrphanGroup: Sendable, Hashable, Identifiable {SizeTotal(items.map(\.size))}- /// What moving the group could free: items Peel leaves alone are listed but not counted, as on an app's page.- public var movable: SizeTotal {- SizeTotal(items.filter { $0.leftAlone == nil }.map(\.size))+ /// What moving the group could free now, which its "to remove" says: the items a checkbox can select, as the bar+ /// beside it counts them, so what Peel leaves alone, and what only the helper moves while it can't, aren't counted.+ public func movable(canUseHelper: Bool) -> SizeTotal {+ let selectable = Set(selectableRows(canUseHelper: canUseHelper).selectable)+ return SizeTotal(items.filter { selectable.contains($0.url) }.map(\.size))}public var lastModified: Date? {diff --git a/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipt.swift b/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipt.swiftindex 2e6c7b3d..46c3475b 100644--- a/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipt.swift+++ b/Packages/PeelCore/Sources/PeelCore/Packages/PackageReceipt.swift@@ -62,11 +62,21 @@ public struct PackageReceipt: Sendable, Hashable, Identifiable {public var id: String { identifier }- /// What forgetting the package's files could free: items Peel leaves alone are listed but not counted. Unknown- /// when the file list is, since an empty list then says nothing about what is left.- public var movable: SizeTotal {+ /// What forgetting the package's files could free now, as an orphan group counts it. Unknown when the file list+ /// is, since an empty list then says nothing about what is left.+ public func movable(canUseHelper: Bool) -> SizeTotal {guard isFileListKnown else { return SizeTotal(known: 0, isComplete: false) }- return SizeTotal(items.filter { !$0.isLeftAlone }.map(\.size))+ let selectable = Set(selectableRows(canUseHelper: canUseHelper).selectable)+ return SizeTotal(items.filter { selectable.contains($0.url) }.map(\.size))+ }++ public func selectableRows(canUseHelper: Bool) -> SelectableRows<URL> {+ let selectable = items.filter { !$0.isLocked(canUseHelper: canUseHelper) && !$0.isLeftAlone }+ return SelectableRows(+ rows: items.map(\.url),+ selectable: selectable.map(\.url),+ recommended: selectable.filter { $0.heldBack == nil }.map(\.url)+ )}/// True when the package still has files on disk but none of them can be moved: each is excluded, protected,diff --git a/Packages/PeelCore/Sources/PeelCore/Space/Installers.swift b/Packages/PeelCore/Sources/PeelCore/Space/Installers.swiftindex 4ec3a2c8..a9f0143a 100644--- a/Packages/PeelCore/Sources/PeelCore/Space/Installers.swift+++ b/Packages/PeelCore/Sources/PeelCore/Space/Installers.swift@@ -73,8 +73,10 @@ extension InstallerItem {}extension Collection where Element == InstallerItem {- public var movable: SizeTotal {- SizeTotal(filter(\.canBeMoved).map(\.size))+ /// What moving the items could free now, as an orphan group counts it.+ public func movable(canUseHelper: Bool) -> SizeTotal {+ let selectable = Set(selectableRows(canUseHelper: canUseHelper).selectable)+ return SizeTotal(filter { selectable.contains($0.url) }.map(\.size))}public func selectableRows(canUseHelper: Bool) -> SelectableRows<URL> {diff --git a/Packages/PeelCore/Tests/PeelCoreTests/InstallersTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/InstallersTests.swiftindex 2168d572..e3809907 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/InstallersTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/InstallersTests.swift@@ -406,7 +406,7 @@ struct InstallersTests {item("iPhone", kind: .deviceBackup, isReadOnly: true), item("Old.iso", heldBack: .mayBeTheOnlyCopy),]- #expect(items.movable == SizeTotal(known: 2_000, isComplete: true))+ #expect(items.movable(canUseHelper: true) == SizeTotal(known: 2_000, isComplete: true))#expect(items.filter(\.canBeMoved).map(\.name) == ["Tool.dmg", "Old.iso"])}diff --git a/Packages/PeelCore/Tests/PeelCoreTests/MovableTotalTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/MovableTotalTests.swiftindex caa61807..e2517bfd 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/MovableTotalTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/MovableTotalTests.swift@@ -17,7 +17,41 @@ struct MovableTotalTests {let group = OrphanGroup(identifier: "org.example.gone", items: [library, cache])#expect(group.total == SizeTotal(known: 1_010, isComplete: true))- #expect(group.movable == SizeTotal(known: 10, isComplete: true))+ #expect(group.movable(canUseHelper: true) == SizeTotal(known: 10, isComplete: true))+ }++ /// What only the helper can move counts while the helper can act, as the bar beside the total counts it.+ @Test func whatOnlyTheHelperMovesCountsOnlyWhileItCanAct() {+ let cache = OrphanItem(+ url: URL(filePath: "/Users/x/Library/Caches/org.example.gone"), kind: .caches, size: 10,+ modificationDate: nil, requiresPrivileges: false+ )+ let daemon = OrphanItem(+ url: URL(filePath: "/Library/LaunchDaemons/org.example.gone.plist"), kind: .launchDaemons, size: 5,+ modificationDate: nil, requiresPrivileges: true+ )+ let group = OrphanGroup(identifier: "org.example.gone", items: [cache, daemon])+ let tool = PackageReceipt.Item(url: URL(filePath: "/usr/local/bin/org.example.tool"), size: 500, requiresPrivileges: true)+ let app = PackageReceipt.Item(url: URL(filePath: "/Applications/Example.app"), size: 20, requiresPrivileges: false)+ let receipt = PackageReceipt(+ identifier: "org.example.pkg", version: nil, installDate: nil, volume: URL(filePath: "/"), items: [tool, app]+ )+ var installer = InstallerItem(+ url: URL(filePath: "/Library/Updates/Example.pkg"), kind: .appInstaller, name: "Example.pkg", size: 300, date: nil,+ installedApp: nil, isReadOnly: false, notes: []+ )+ installer.requiresPrivileges = true+ let download = InstallerItem(+ url: URL(filePath: "/Users/x/Downloads/Example.dmg"), kind: .appInstaller, name: "Example.dmg", size: 40,+ date: nil, installedApp: nil, isReadOnly: false, notes: []+ )++ #expect(group.movable(canUseHelper: false) == SizeTotal(known: 10, isComplete: true))+ #expect(group.movable(canUseHelper: true) == SizeTotal(known: 15, isComplete: true))+ #expect(receipt.movable(canUseHelper: false) == SizeTotal(known: 20, isComplete: true))+ #expect(receipt.movable(canUseHelper: true) == SizeTotal(known: 520, isComplete: true))+ #expect([installer, download].movable(canUseHelper: false) == SizeTotal(known: 40, isComplete: true))+ #expect([installer, download].movable(canUseHelper: true) == SizeTotal(known: 340, isComplete: true))}@Test func anOrphanGroupKnowsWhyNothingInItCanMove() {@@ -51,8 +85,8 @@ struct MovableTotalTests {identifier: "org.example.pkg", version: nil, installDate: nil, volume: URL(filePath: "/"), items: [tool, app])- #expect(receipt.movable == SizeTotal(known: 20, isComplete: true))+ #expect(receipt.movable(canUseHelper: true) == SizeTotal(known: 20, isComplete: true))receipt.isFileListKnown = false- #expect(receipt.movable == SizeTotal(known: 0, isComplete: false))+ #expect(receipt.movable(canUseHelper: true) == SizeTotal(known: 0, isComplete: false))}}diff --git a/Packages/PeelCore/Tests/PeelCoreTests/PackageReceiptsTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/PackageReceiptsTests.swiftindex 4e7ea790..106a02aa 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/PackageReceiptsTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/PackageReceiptsTests.swift@@ -596,7 +596,7 @@ struct PackageReceiptsTests {#expect(receipt.identifier == "com.example.quiet")#expect(!receipt.isFileListKnown)#expect(!receipt.holdsNothingToRemove, "an unknown file list read as \"Nothing Peel moves\"")- #expect(!receipt.movable.isComplete, "an unknown file list read as a size of zero")+ #expect(!receipt.movable(canUseHelper: true).isComplete, "an unknown file list read as a size of zero")}/// A `pkgid` found that way says only that some package lists a path ending like this one.diff --git a/Peel/Model/FoundLastTimeStore.swift b/Peel/Model/FoundLastTimeStore.swiftindex 196e1a70..d4331258 100644--- a/Peel/Model/FoundLastTimeStore.swift+++ b/Peel/Model/FoundLastTimeStore.swift@@ -42,9 +42,13 @@ extension AppLibrary {}extension OrphanLibrary {- /// The groups, sized by what Peel can move. What only an administrator can move is no group of Peel's to free.+ /// The groups, sized by what Peel can move with its helper. What only an administrator can move is no group of+ /// Peel's to free.var looked: Looked? {- scan.map { Looked(count: $0.groups.count, size: SizeTotal(combining: $0.groups.map(\.movable))) }+ scan.map { scan in+ let movable = scan.groups.map { $0.movable(canUseHelper: true) }+ return Looked(count: scan.groups.count, size: SizeTotal(combining: movable))+ }}}@@ -84,7 +88,7 @@ extension ProjectLibrary {extension InstallerLibrary {/// The items, sized by what Peel can move: a device backup is the app's that made it, and stays off the size.var looked: Looked? {- scan.map { Looked(count: $0.items.count, size: $0.items.movable) }+ scan.map { Looked(count: $0.items.count, size: $0.items.movable(canUseHelper: true)) }}}diff --git a/Peel/Views/Installers/InstallerDetailView.swift b/Peel/Views/Installers/InstallerDetailView.swiftindex e3c65c7a..be74ea23 100644--- a/Peel/Views/Installers/InstallerDetailView.swift+++ b/Peel/Views/Installers/InstallerDetailView.swift@@ -106,7 +106,7 @@ struct InstallerDetailView: View {}} trailing: {TotalLabel(- total: kind == .deviceBackup ? SizeTotal(rows.map(\.size)) : rows.movable,+ total: kind == .deviceBackup ? SizeTotal(rows.map(\.size)) : rows.movable(canUseHelper: helper.canAct),caption: Text(kind == .deviceBackup ? "on this Mac" : "to remove"))}diff --git a/Peel/Views/Orphans/OrphanDetailView.swift b/Peel/Views/Orphans/OrphanDetailView.swiftindex 9ff38b92..6ae53a4b 100644--- a/Peel/Views/Orphans/OrphanDetailView.swift+++ b/Peel/Views/Orphans/OrphanDetailView.swift@@ -129,8 +129,9 @@ struct OrphanDetailView: View {}}} trailing: {- TotalLabel(total: group.movable, caption: Text("to remove"))- .accessibilityLabel(Text("\(group.movable.text) can be moved to the Trash"))+ let movable = group.movable(canUseHelper: helper.canAct)+ TotalLabel(total: movable, caption: Text("to remove"))+ .accessibilityLabel(Text("\(movable.text) can be moved to the Trash"))}}}diff --git a/Peel/Views/Orphans/OrphanList.swift b/Peel/Views/Orphans/OrphanList.swiftindex da8c7eac..9cb291ea 100644--- a/Peel/Views/Orphans/OrphanList.swift+++ b/Peel/Views/Orphans/OrphanList.swift@@ -21,7 +21,7 @@ struct OrphanList: View {.tag(OrphanPage.forAnAdministrator)}ForEach(filtered) { group in- OrphanGroupRow(group: group)+ OrphanGroupRow(group: group, canUseHelper: helper.canAct).tag(OrphanPage.group(group.id))}}@@ -224,6 +224,7 @@ private struct AdministratorRow: View {private struct OrphanGroupRow: View {let group: OrphanGroup+ let canUseHelper: Boolvar body: some View {HStack(spacing: 6) {@@ -253,7 +254,7 @@ private struct OrphanGroupRow: View {.foregroundStyle(.secondary)}Spacer(minLength: 6)- Text(group.movable.text)+ Text(group.movable(canUseHelper: canUseHelper).text).rowFigure()}.padding(.vertical, 2)diff --git a/Peel/Views/Packages/PackageDetailView.swift b/Peel/Views/Packages/PackageDetailView.swiftindex df12c864..5ee2b621 100644--- a/Peel/Views/Packages/PackageDetailView.swift+++ b/Peel/Views/Packages/PackageDetailView.swift@@ -192,9 +192,10 @@ struct PackageDetailView: View {}}} trailing: {- if receipt.movable.known > 0 || !receipt.movable.isComplete {- TotalLabel(total: receipt.movable, caption: Text("to remove"))- .accessibilityLabel(Text("\(receipt.movable.text) can be moved to the Trash"))+ let movable = receipt.movable(canUseHelper: helper.canAct)+ if movable.known > 0 || !movable.isComplete {+ TotalLabel(total: movable, caption: Text("to remove"))+ .accessibilityLabel(Text("\(movable.text) can be moved to the Trash"))}}}@@ -206,11 +207,7 @@ struct PackageDetailView: View {}private var list: SelectableRows<URL> {- SelectableRows(- rows: receipt.items.map(\.url),- selectable: receipt.items.filter { !isLocked($0) && !$0.isLeftAlone }.map(\.url),- recommended: receipt.items.filter { !isLocked($0) && !$0.isLeftAlone && $0.heldBack == nil }.map(\.url)- )+ receipt.selectableRows(canUseHelper: helper.canAct)}private func isLocked(_ item: PackageReceipt.Item) -> Bool {diff --git a/Peel/Views/Packages/PackageList.swift b/Peel/Views/Packages/PackageList.swiftindex 16a4f303..a3a6dd9d 100644--- a/Peel/Views/Packages/PackageList.swift+++ b/Peel/Views/Packages/PackageList.swift@@ -130,7 +130,7 @@ struct PackageList: View {}Spacer(minLength: 6)if !receipt.nothingLeftOnDisk, !receipt.holdsNothingToRemove {- Text(receipt.movable.text)+ Text(receipt.movable(canUseHelper: helper.canAct).text).rowFigure()}}