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
Applications rebuilds only what a size or an update answer changes
Țugui Dragoșa4d582694a1c
diff --git a/Peel/Views/AppDetailView.swift b/Peel/Views/AppDetailView.swiftindex 5e2d0141..e4f7c1ee 100644--- a/Peel/Views/AppDetailView.swift+++ b/Peel/Views/AppDetailView.swift@@ -18,7 +18,6 @@ struct AppDetailView: View {/// The result of the last privacy reset started from the More menu, shown under the buttons.@State private var privacyReset: PrivacyReset.Result?@State private var upgradeOutput: HomebrewLibrary.CommandResult?- @Environment(\.notifications) private var notifications@Environment(\.openSettings) private var openSettings@State private var isShowingReset = false@State private var resetChangedFiles = false@@ -102,16 +101,13 @@ struct AppDetailView: View {private var page: some View {List {- AppHeader(- app: plan.app,- updateStatus: library.shownUpdateStatus(of: plan.app),- isCheckingForUpdates: library.appsCheckingForUpdates.contains(plan.app.id),- waitingVersion: waitingVersion == nil ? nil : library.updateStatuses[plan.app.id]?.displayVersion,- lastCheck: library.lastUpdateChecks[plan.app.id],- total: plan.total- ) {- appActions- }+ AppPageHeader(+ plan: plan,+ privacyReset: privacyReset,+ isShowingReset: $isShowingReset,+ isConfirmingPrivacyReset: $isConfirmingPrivacyReset,+ upgradeOutput: $upgradeOutput+ ).listRowSeparator(.hidden)RemovalsHeldBanner()@@ -339,141 +335,6 @@ struct AppDetailView: View {}}- /// The version an update would bring. Nil when there is no update, or when the user muted this app or- /// this version.- private var waitingVersion: String? {- library.hasUpdate(plan.app) ? library.updateStatuses[plan.app.id]?.version : nil- }-- private var updateSource: UpdateSource? {- library.updateStatuses[plan.app.id]?.source- }-- /// What can be done to the app without removing it: update it, open its maker's uninstaller, or reset it.- /// Less common actions, such as the release notes or muting updates, sit in the More menu.- private var appActions: some View {- VStack(alignment: .leading, spacing: 6) {- FlowLayout {- if let version = waitingVersion, let source = updateSource {- updateAction(for: source, version: version)- }- if let uninstaller = plan.vendorUninstaller {- Button("Open Uninstaller", systemImage: "arrow.up.forward.app") {- NSWorkspace.shared.open(uninstaller)- }- .buttonStyle(.bordered)- .disabled(plan.isExcluded)- .help(plan.isExcluded ? Text(.excludedApp) : Text("Run the maker’s uninstaller first: it knows what Peel can only guess at."))- }- // Not on Peel's own page: Peel is always open, so the sheet could only ever offer to quit it.- if plan.app.bundleIdentifier != Bundle.main.bundleIdentifier {- Button("Reset\u{2026}") { isShowingReset = true }- .buttonStyle(.bordered)- .disabled(plan.isExcluded)- .help(plan.isExcluded ? Text(.excludedApp) : Text("Make \(plan.app.name) forget its settings without uninstalling it"))- }- moreMenu- }- if let upgrade = library.upgrade(of: plan.app) {- outcome(of: upgrade)- } else if let source = updateSource, waitingVersion != nil {- Text(updateExplanation(for: source))- .font(.caption)- .foregroundStyle(.secondary)- }- if let privacyReset {- outcome(of: privacyReset)- }- }- }-- private var moreMenu: some View {- Menu {- if let notes = library.updateStatuses[plan.app.id]?.releaseNotes {- Button("Release Notes") { NSWorkspace.shared.open(notes) }- }- if let version = waitingVersion {- Button("Skip This Version") { library.skip(version: version, for: plan.app) }- }- Toggle("Never Check This App", isOn: Binding(- get: { library.isIgnored(plan.app) },- set: { library.setIgnored($0, for: plan.app) }- ))- Divider()- Button("Show in Finder") {- NSWorkspace.shared.activateFileViewerSelecting([plan.app.url])- }- if PrivacyReset.isAllowed(bundleIdentifier: plan.app.bundleIdentifier), !plan.isAppInTheTrash {- Divider()- Button("Reset Privacy Permissions\u{2026}") { isConfirmingPrivacyReset = true }- .disabled(plan.isExcluded)- }- } label: {- Label("More", systemImage: "ellipsis")- }- .menuStyle(.button)- .buttonStyle(.bordered)- .labelStyle(.iconOnly)- .fixedSize()- .help(Text("More options for \(plan.app.name)"))- .accessibilityLabel(Text("More options for \(plan.app.name)"))- }-- private func updateExplanation(for source: UpdateSource) -> LocalizedStringResource {- switch source {- case .appStore: "The App Store has it. Update from the App Store."- case .homebrew where library.cask(for: plan.app)?.upgradeNeedsAnAdministrator == true:- "Homebrew needs an administrator’s password for this, and only Terminal can ask for it. Copy the command, then run it in Terminal."- case .homebrew where homebrew.overrides.contains(.cleansUp):- HomebrewLibrary.cleansUp- case .homebrew: "Homebrew has it. Peel can run the upgrade for you."- case .developer, .automatic: "The maker has it. Update from inside the app."- }- }-- /// Whether the cask's upgrade is left to Terminal: it asks for an administrator's password, which only Terminal- /// can give, or Homebrew would clean up after it.- private var upgradeNeedsTerminal: Bool {- library.cask(for: plan.app)?.upgradeNeedsAnAdministrator == true || homebrew.overrides.contains(.cleansUp)- }-- @ViewBuilder- private func updateAction(for source: UpdateSource, version: String) -> some View {- switch source {- case .appStore:- Button("Open App Store", systemImage: "bag") {- let page = library.updateStatuses[plan.app.id]?.releaseNotes- NSWorkspace.shared.open(page ?? URL(string: "macappstore://showUpdatesPage")!)- }- .buttonStyle(.borderedProminent)- case .homebrew where upgradeNeedsTerminal:- if let cask = library.cask(for: plan.app) {- CopyButton(text: "brew upgrade --cask \(cask.fullName)", title: "Copy Upgrade Command")- }- case .homebrew:- Button {- Task { await upgradeWithHomebrew() }- } label: {- if isUpgrading {- HStack(spacing: 6) {- ProgressView()- .controlSize(.small)- Text("Upgrading\u{2026}")- }- } else {- Label("Upgrade with Homebrew", systemImage: "mug")- }- }- .buttonStyle(.borderedProminent)- .disabled(homebrew.runningCommand != nil)- case .developer, .automatic:- Button("Open \(plan.app.name)", systemImage: "arrow.up.forward.app") {- NSWorkspace.shared.open(plan.app.url)- }- .buttonStyle(.borderedProminent)- }- }-/// A reset moves files to the Trash, and an exclusion changes what may be listed at all, so after either/// one the tables are out of date. A scan asked for while the question is up or a removal runs waits for them.private func rescan() async {@@ -481,72 +342,6 @@ struct AppDetailView: View {await plan.refresh(installedApps: library.apps, canUseHelper: helper.canAct, casks: homebrew.caskEvidence, receipts: homebrew.receipts)}- private var isUpgrading: Bool {- guard let cask = library.cask(for: plan.app) else { return false }- return homebrew.runningCommand == .upgrade(cask.id)- }-- /// Upgrades the app with Homebrew, which can take a while. The button shows progress while it runs, the- /// line under it shows the result, and a notification reports it too, in case the user has moved on.- private func upgradeWithHomebrew() async {- guard let cask = library.cask(for: plan.app) else { return }- let app = plan.app- library.record(nil, of: app)- // Nil when Homebrew is already running a command. The button is disabled then, so this is only a safeguard.- guard let result = await homebrew.run(.upgrade(cask.id), showsResult: false) else { return }- let succeeded = result.succeeded- upgradeOutput = succeeded ? nil : result-- // Homebrew's own answer is read again first: it is what says whether a version is behind, and the copy from- // before the upgrade still said this one was. A new build gets a page of its own, which scans it.- await library.refresh()- library.loadHomebrewCasks(homebrew.caskEvidence, knowsItsOwnApps: homebrew.knowsItsOwnApps)- let upgraded = library.apps.first { $0.id == app.id } ?? app- library.record(AppLibrary.Upgrade(app: upgraded, succeeded: succeeded), of: upgraded)- await library.checkForUpdates([upgraded], force: true)-- // A notification either way, so the user learns how it went even after leaving the page.- if succeeded {- notifications?.notify(appUpgraded: upgraded.name, to: upgraded.version, app: upgraded.url)- } else {- notifications?.notify(appUpgradeFailed: upgraded.name, app: upgraded.url)- }- }-- @ViewBuilder- private func outcome(of upgrade: AppLibrary.Upgrade) -> some View {- if upgrade.succeeded {- Label {- if let version = upgrade.app.version {- Text("Now on \(version).")- } else {- Text("Homebrew finished the upgrade.")- }- } icon: {- Image(systemName: "checkmark.circle.fill")- }- .font(.caption)- .foregroundStyle(.green)- } else {- Label("Homebrew couldn’t finish the upgrade.", systemImage: "exclamationmark.triangle.fill")- .font(.caption)- .foregroundStyle(.red)- }- }-- @ViewBuilder- private func outcome(of privacyReset: PrivacyReset.Result) -> some View {- if let problem = privacyReset.explanation {- Label("Privacy permissions weren’t reset. \(problem)", systemImage: "exclamationmark.triangle.fill")- .font(.caption)- .foregroundStyle(.red)- } else {- Label("Privacy permissions were reset. \(plan.app.name) asks you again the next time it needs them.", systemImage: "checkmark.circle.fill")- .font(.caption)- .foregroundStyle(.green)- }- }-private func row(for leftover: Leftover) -> some View {RemovalRow(url: leftover.url,diff --git a/Peel/Views/AppPageHeader.swift b/Peel/Views/AppPageHeader.swiftnew file mode 100644index 00000000..6fd883fe--- /dev/null+++ b/Peel/Views/AppPageHeader.swift@@ -0,0 +1,230 @@+import PeelCore+import SwiftUI++/// The head of an app's page: the app, its update, and what can be done to it without removing it. A view of its+/// own because what it shows of the update is read from dictionaries every app's check writes into: read in the+/// page's body, any app's answer would build the whole page again.+struct AppPageHeader: View {+ @Environment(AppLibrary.self) private var library+ @Environment(HomebrewLibrary.self) private var homebrew+ @Environment(\.notifications) private var notifications+ let plan: RemovalPlan+ let privacyReset: PrivacyReset.Result?+ @Binding var isShowingReset: Bool+ @Binding var isConfirmingPrivacyReset: Bool+ @Binding var upgradeOutput: HomebrewLibrary.CommandResult?++ var body: some View {+ AppHeader(+ app: plan.app,+ updateStatus: library.shownUpdateStatus(of: plan.app),+ isCheckingForUpdates: library.appsCheckingForUpdates.contains(plan.app.id),+ waitingVersion: waitingVersion == nil ? nil : library.updateStatuses[plan.app.id]?.displayVersion,+ lastCheck: library.lastUpdateChecks[plan.app.id],+ total: plan.total+ ) {+ appActions+ }+ }++ /// The version an update would bring. Nil when there is no update, or when the user muted this app or+ /// this version.+ private var waitingVersion: String? {+ library.hasUpdate(plan.app) ? library.updateStatuses[plan.app.id]?.version : nil+ }++ private var updateSource: UpdateSource? {+ library.updateStatuses[plan.app.id]?.source+ }++ /// What can be done to the app without removing it: update it, open its maker's uninstaller, or reset it.+ /// Less common actions, such as the release notes or muting updates, sit in the More menu.+ private var appActions: some View {+ VStack(alignment: .leading, spacing: 6) {+ FlowLayout {+ if let version = waitingVersion, let source = updateSource {+ updateAction(for: source, version: version)+ }+ if let uninstaller = plan.vendorUninstaller {+ Button("Open Uninstaller", systemImage: "arrow.up.forward.app") {+ NSWorkspace.shared.open(uninstaller)+ }+ .buttonStyle(.bordered)+ .disabled(plan.isExcluded)+ .help(plan.isExcluded ? Text(.excludedApp) : Text("Run the maker’s uninstaller first: it knows what Peel can only guess at."))+ }+ // Not on Peel's own page: Peel is always open, so the sheet could only ever offer to quit it.+ if plan.app.bundleIdentifier != Bundle.main.bundleIdentifier {+ Button("Reset\u{2026}") { isShowingReset = true }+ .buttonStyle(.bordered)+ .disabled(plan.isExcluded)+ .help(plan.isExcluded ? Text(.excludedApp) : Text("Make \(plan.app.name) forget its settings without uninstalling it"))+ }+ moreMenu+ }+ if let upgrade = library.upgrade(of: plan.app) {+ outcome(of: upgrade)+ } else if let source = updateSource, waitingVersion != nil {+ Text(updateExplanation(for: source))+ .font(.caption)+ .foregroundStyle(.secondary)+ }+ if let privacyReset {+ outcome(of: privacyReset)+ }+ }+ }++ private var moreMenu: some View {+ Menu {+ if let notes = library.updateStatuses[plan.app.id]?.releaseNotes {+ Button("Release Notes") { NSWorkspace.shared.open(notes) }+ }+ if let version = waitingVersion {+ Button("Skip This Version") { library.skip(version: version, for: plan.app) }+ }+ Toggle("Never Check This App", isOn: Binding(+ get: { library.isIgnored(plan.app) },+ set: { library.setIgnored($0, for: plan.app) }+ ))+ Divider()+ Button("Show in Finder") {+ NSWorkspace.shared.activateFileViewerSelecting([plan.app.url])+ }+ if PrivacyReset.isAllowed(bundleIdentifier: plan.app.bundleIdentifier), !plan.isAppInTheTrash {+ Divider()+ Button("Reset Privacy Permissions\u{2026}") { isConfirmingPrivacyReset = true }+ .disabled(plan.isExcluded)+ }+ } label: {+ Label("More", systemImage: "ellipsis")+ }+ .menuStyle(.button)+ .buttonStyle(.bordered)+ .labelStyle(.iconOnly)+ .fixedSize()+ .help(Text("More options for \(plan.app.name)"))+ .accessibilityLabel(Text("More options for \(plan.app.name)"))+ }++ private func updateExplanation(for source: UpdateSource) -> LocalizedStringResource {+ switch source {+ case .appStore: "The App Store has it. Update from the App Store."+ case .homebrew where library.cask(for: plan.app)?.upgradeNeedsAnAdministrator == true:+ "Homebrew needs an administrator’s password for this, and only Terminal can ask for it. Copy the command, then run it in Terminal."+ case .homebrew where homebrew.overrides.contains(.cleansUp):+ HomebrewLibrary.cleansUp+ case .homebrew: "Homebrew has it. Peel can run the upgrade for you."+ case .developer, .automatic: "The maker has it. Update from inside the app."+ }+ }++ /// Whether the cask's upgrade is left to Terminal: it asks for an administrator's password, which only Terminal+ /// can give, or Homebrew would clean up after it.+ private var upgradeNeedsTerminal: Bool {+ library.cask(for: plan.app)?.upgradeNeedsAnAdministrator == true || homebrew.overrides.contains(.cleansUp)+ }++ @ViewBuilder+ private func updateAction(for source: UpdateSource, version: String) -> some View {+ switch source {+ case .appStore:+ Button("Open App Store", systemImage: "bag") {+ let page = library.updateStatuses[plan.app.id]?.releaseNotes+ NSWorkspace.shared.open(page ?? URL(string: "macappstore://showUpdatesPage")!)+ }+ .buttonStyle(.borderedProminent)+ case .homebrew where upgradeNeedsTerminal:+ if let cask = library.cask(for: plan.app) {+ CopyButton(text: "brew upgrade --cask \(cask.fullName)", title: "Copy Upgrade Command")+ }+ case .homebrew:+ Button {+ Task { await upgradeWithHomebrew() }+ } label: {+ if isUpgrading {+ HStack(spacing: 6) {+ ProgressView()+ .controlSize(.small)+ Text("Upgrading\u{2026}")+ }+ } else {+ Label("Upgrade with Homebrew", systemImage: "mug")+ }+ }+ .buttonStyle(.borderedProminent)+ .disabled(homebrew.runningCommand != nil)+ case .developer, .automatic:+ Button("Open \(plan.app.name)", systemImage: "arrow.up.forward.app") {+ NSWorkspace.shared.open(plan.app.url)+ }+ .buttonStyle(.borderedProminent)+ }+ }++ private var isUpgrading: Bool {+ guard let cask = library.cask(for: plan.app) else { return false }+ return homebrew.runningCommand == .upgrade(cask.id)+ }++ /// Upgrades the app with Homebrew, which can take a while. The button shows progress while it runs, the+ /// line under it shows the result, and a notification reports it too, in case the user has moved on.+ private func upgradeWithHomebrew() async {+ guard let cask = library.cask(for: plan.app) else { return }+ let app = plan.app+ library.record(nil, of: app)+ // Nil when Homebrew is already running a command. The button is disabled then, so this is only a safeguard.+ guard let result = await homebrew.run(.upgrade(cask.id), showsResult: false) else { return }+ let succeeded = result.succeeded+ upgradeOutput = succeeded ? nil : result++ // Homebrew's own answer is read again first: it is what says whether a version is behind, and the copy from+ // before the upgrade still said this one was. A new build gets a page of its own, which scans it.+ await library.refresh()+ library.loadHomebrewCasks(homebrew.caskEvidence, knowsItsOwnApps: homebrew.knowsItsOwnApps)+ let upgraded = library.apps.first { $0.id == app.id } ?? app+ library.record(AppLibrary.Upgrade(app: upgraded, succeeded: succeeded), of: upgraded)+ await library.checkForUpdates([upgraded], force: true)++ // A notification either way, so the user learns how it went even after leaving the page.+ if succeeded {+ notifications?.notify(appUpgraded: upgraded.name, to: upgraded.version, app: upgraded.url)+ } else {+ notifications?.notify(appUpgradeFailed: upgraded.name, app: upgraded.url)+ }+ }++ @ViewBuilder+ private func outcome(of upgrade: AppLibrary.Upgrade) -> some View {+ if upgrade.succeeded {+ Label {+ if let version = upgrade.app.version {+ Text("Now on \(version).")+ } else {+ Text("Homebrew finished the upgrade.")+ }+ } icon: {+ Image(systemName: "checkmark.circle.fill")+ }+ .font(.caption)+ .foregroundStyle(.green)+ } else {+ Label("Homebrew couldn’t finish the upgrade.", systemImage: "exclamationmark.triangle.fill")+ .font(.caption)+ .foregroundStyle(.red)+ }+ }++ @ViewBuilder+ private func outcome(of privacyReset: PrivacyReset.Result) -> some View {+ if let problem = privacyReset.explanation {+ Label("Privacy permissions weren’t reset. \(problem)", systemImage: "exclamationmark.triangle.fill")+ .font(.caption)+ .foregroundStyle(.red)+ } else {+ Label("Privacy permissions were reset. \(plan.app.name) asks you again the next time it needs them.", systemImage: "checkmark.circle.fill")+ .font(.caption)+ .foregroundStyle(.green)+ }+ }+}diff --git a/Peel/Views/ContentView.swift b/Peel/Views/ContentView.swiftindex 7e7d395f..93b24d5c 100644--- a/Peel/Views/ContentView.swift+++ b/Peel/Views/ContentView.swift@@ -513,11 +513,21 @@ struct ContentView: View {MultipleAppsView(apps: library.selectedApps).id(library.selectedApps.map(Self.build))} else {- DetailPlaceholder(tool: .applications, summary: library.summary, instruction: "Choose an app to see what it leaves behind.")+ ApplicationsPlaceholder()}}}+/// The Applications pane with no app chosen. A view of its own because its summary reads every app's size and+/// update: read in the window's body, each size measured would build the whole window again.+private struct ApplicationsPlaceholder: View {+ @Environment(AppLibrary.self) private var library++ var body: some View {+ DetailPlaceholder(tool: .applications, summary: library.summary, instruction: "Choose an app to see what it leaves behind.")+ }+}+/// A page of the window: a tool, or one of the pages that take the whole pane.private struct Destination: Equatable {var tool: Tooldiff --git a/Peel/Views/ToolSummaries.swift b/Peel/Views/ToolSummaries.swiftindex 7ca37573..0f5ad261 100644--- a/Peel/Views/ToolSummaries.swift+++ b/Peel/Views/ToolSummaries.swift@@ -160,10 +160,11 @@ extension RemovalHistoryStore {extension View {/// Tells VoiceOver how a scan ended, since the list fills in silently: what it found, that it was stopped, or- /// `couldNotLook`, the title of the page's message, in place of "Nothing found." when it could not look.+ /// `couldNotLook`, the title of the page's message, in place of "Nothing found." when it could not look. The+ /// summary is worked out only then, so the page does not depend on everything it reads.func announcesScan(_ isScanning: Bool,- found summary: AttributedString?,+ found summary: @autoclosure @escaping () -> AttributedString?,couldNotLook: LocalizedStringResource? = nil,wasStopped: Bool = false) -> some View {@@ -171,7 +172,7 @@ extension View {guard wasScanning, !scanning else { return }let nothing = couldNotLook.map { AttributedString(localized: $0) }?? AttributedString(localized: "Nothing found.")- let words = wasStopped ? AttributedString(localized: "Scan stopped.") : summary ?? nothing+ let words = wasStopped ? AttributedString(localized: "Scan stopped.") : summary() ?? nothingAccessibilityNotification.Announcement(words).post()}}