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
Take no step of Remove Peel while Peel itself could not move
Țugui Dragoș15264c36b7b3
diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/SelfRemoval.swift b/Packages/PeelCore/Sources/PeelCore/Removal/SelfRemoval.swiftindex 54df534b..878dd2ec 100644--- a/Packages/PeelCore/Sources/PeelCore/Removal/SelfRemoval.swift+++ b/Packages/PeelCore/Sources/PeelCore/Removal/SelfRemoval.swift@@ -99,6 +99,10 @@ public enum SelfRemoval {if await steps.helperIsRegistered(), await !steps.helperMayBeChanged() {return .stayed(.helperIsNotThisAccounts)}+ // Nothing that can't be undone starts while Peel's own move would be refused.+ if let refusal = await service.refusalsNow(ofApps: [app], lettingTheirProgramsRun: [app])[app] {+ return .stayed(.appStayed(failures: [TrashFailure(url: app, reason: refusal)], ledger: .none))+ }await steps.pauseWork()var ledger = PrivilegedHelper.LedgerMove.nonevar movedLinks = TrashResult()diff --git a/Packages/PeelCore/Tests/PeelCoreTests/SelfRemovalTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/SelfRemovalTests.swiftindex 24609def..8720d3d2 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/SelfRemovalTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/SelfRemovalTests.swift@@ -159,6 +159,43 @@ struct SelfRemovalTests {#expect(app.isThere)}+ @Test(arguments: ["History unreadable", "exclusions unreadable", "exclusions not yet read"])+ func takesNoStepWhilePeelsOwnMoveWouldBeRefused(_ state: String) async throws {+ let directory = try TemporaryDirectory()+ let log = StepLog(helperIsRegistered: true)+ let app = try directory.directory("home/Applications/Peel.app")+ let folder = try directory.directory("home/Library/Application Support/Peel")+ let history = folder.appending(path: "removals.json")+ if state == "History unreadable" {+ try FileManager.default.createDirectory(at: history, withIntermediateDirectories: false)+ }+ let trash = try directory.directory("Trash")+ let service = TrashService(+ environment: SearchEnvironment(+ homeDirectory: directory.url.appending(path: "home", directoryHint: .isDirectory),+ rootDirectory: directory.url.appending(path: "root", directoryHint: .isDirectory)+ ),+ exclusions: state == "exclusions unreadable" ? .unreadable+ : state == "exclusions not yet read" ? .notYetRead : .none,+ journal: RemovalJournal(beside: history)+ ) { url in+ let destination = trash.appending(path: UUID().uuidString)+ try FileManager.default.moveItem(at: url, to: destination)+ return destination+ }++ let outcome = await SelfRemoval.remove(+ [app], links: [], app: app, folder: folder, steps: steps(log, in: directory), using: service+ ) { await log.record($0) }++ let reason: TrashFailure.Reason = state == "History unreadable" ? .historyUnreadable+ : .guarded(.exclusionsNotKnown)+ #expect(outcome == .stayed(.appStayed(failures: [TrashFailure(url: app, reason: reason)], ledger: .none)))+ #expect(await log.steps.isEmpty)+ #expect(await log.recorded.isEmpty)+ #expect(app.isThere)+ }+@Test func anAppTheMoveRefusesKeepsPeelWhereItWas() async throws {let directory = try TemporaryDirectory()let log = StepLog(helperIsRegistered: false)@@ -331,6 +368,28 @@ struct SelfRemovalTests {#expect(!result.failures.contains { $0.reason == .peelRunsFromIt })}+ @Test func takesItsStepsForTheAppPeelRunsFrom() async throws {+ let directory = try TemporaryDirectory()+ let log = StepLog(helperIsRegistered: true)+ let program = try #require(RunningProgram.path(of: getpid()))+ let app = URL(filePath: program).deletingLastPathComponent()+ let folder = try directory.directory("home/Library/Application Support/Peel")+ let service = TrashService(environment: SearchEnvironment(+ homeDirectory: directory.url.appending(path: "home", directoryHint: .isDirectory),+ rootDirectory: directory.url.appending(path: "root", directoryHint: .isDirectory)+ )) { $0 }++ let outcome = await SelfRemoval.remove(+ [app], links: [], app: app, folder: folder, steps: steps(log, in: directory), using: service+ ) { _ in }++ #expect(await log.steps == ["pause", "move ledger", "uninstall helper", "login item"])+ guard case .moved = outcome else {+ Issue.record("Peel stayed: \(outcome)")+ return+ }+ }+/// The link the helper moved before it went is written into History with the rest, as one removal.@Test func recordsWhatTheHelperMovedFirstWithTheRest() async throws {let directory = try TemporaryDirectory()diff --git a/Peel/Views/Settings/SettingsView.swift b/Peel/Views/Settings/SettingsView.swiftindex cad4f92a..a7dbe87f 100644--- a/Peel/Views/Settings/SettingsView.swift+++ b/Peel/Views/Settings/SettingsView.swift@@ -208,6 +208,7 @@ private struct GeneralSettingsView: View {@Environment(HomebrewLibrary.self) private var homebrew@Environment(HelperModel.self) private var helper@Environment(RemovalHistoryStore.self) private var history+ @Environment(ExclusionsStore.self) private var exclusions@Environment(StandingWork.self) private var background@Environment(HomeModel.self) private var home@State private var selfUninstall = SelfUninstall()@@ -434,8 +435,18 @@ private struct GeneralSettingsView: View {.disabled(selfUninstall.isRunning || !library.hasLoaded|| (homebrew.isInstalled && homebrew.packages == nil)+ || !exclusions.exclusions.isKnown || history.isUnreadable)}+ if exclusions.exclusions.isUnreadable {+ Text("Peel removes nothing and puts nothing back until you start the list over in Settings.")+ .font(.callout)+ .foregroundStyle(.secondary)+ } else if history.isUnreadable {+ Text("Peel removes nothing until you start History over, so that everything it moves can be put back.")+ .font(.callout)+ .foregroundStyle(.secondary)+ }}// Homebrew removes the links its cask made, and no other.if selfUninstall.leavesCommandLineTool(helper: helper.status),