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
Say why the choice of brew couldn't be saved
Țugui Dragoșd80b4f8c65ba
diff --git a/Packages/PeelCore/Sources/PeelCore/Homebrew/HomebrewChoice.swift b/Packages/PeelCore/Sources/PeelCore/Homebrew/HomebrewChoice.swiftindex 8a124df8..d6930a34 100644--- a/Packages/PeelCore/Sources/PeelCore/Homebrew/HomebrewChoice.swift+++ b/Packages/PeelCore/Sources/PeelCore/Homebrew/HomebrewChoice.swift@@ -46,11 +46,16 @@ public struct HomebrewChoice: Sendable {return Unrunnable(brew: brew, refusal: refusal)}- /// Keeps `brew` as the one to run, or forgets the choice when it is nil. False when it could not be saved.+ /// Keeps `brew` as the one to run, or forgets the choice when it is nil, and answers why it couldn't be saved, or+ /// nil once it is.@discardableResult- public func save(_ brew: URL?) -> Bool {- guard let data = try? JSONEncoder().encode(brew?.path(percentEncoded: false)) else { return false }- return (try? PeelFolder.write(data, to: url)) != nil+ public func save(_ brew: URL?) -> FileProblem? {+ do {+ try PeelFolder.write(try JSONEncoder().encode(brew?.path(percentEncoded: false)), to: url)+ return nil+ } catch {+ return .failed(SystemError(error))+ }}/// Why `brew` cannot be the one Peel runs, or nil. A link is followed, since the file it leads to is what runs.diff --git a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewChoiceTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewChoiceTests.swiftindex e6b77bc6..67e6b5ed 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewChoiceTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewChoiceTests.swift@@ -30,17 +30,27 @@ struct HomebrewChoiceTests {let choice = HomebrewChoice(url: directory.url.appending(path: "Peel/homebrew.json"))#expect(choice.load() == nil)- #expect(choice.save(brew))+ #expect(choice.save(brew) == nil)#expect(choice.load()?.path(percentEncoded: false) == brew.path(percentEncoded: false))- #expect(choice.save(nil))+ #expect(choice.save(nil) == nil)#expect(choice.load() == nil)}+ @Test(.permissionsHold) func saysWhyTheChoiceCouldNotBeSaved() throws {+ let directory = try TemporaryDirectory()+ let folder = try directory.directory("Peel")+ try directory.setPermissions(0o500, of: folder)+ defer { try? directory.setPermissions(0o755, of: folder) }++ let refusedWrite = SystemError(domain: NSCocoaErrorDomain, code: NSFileWriteNoPermissionError)+ #expect(HomebrewChoice(url: folder.appending(path: "homebrew.json")).save(nil) == .failed(refusedWrite))+ }+@Test func runsNoOtherBrewWhileTheChosenOneCannotRun() throws {let directory = try TemporaryDirectory()let brew = try program("opt/brew/bin/brew", in: directory)let choice = HomebrewChoice(url: directory.url.appending(path: "homebrew.json"))- #expect(choice.save(brew))+ #expect(choice.save(brew) == nil)chmod(brew.path(percentEncoded: false), 0o644)diff --git a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewDataTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewDataTests.swiftindex e68d285a..9d249385 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewDataTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewDataTests.swift@@ -42,11 +42,11 @@ import Testingtry directory.directory("root/usr/local/Cellar")let choice = HomebrewChoice(url: HomebrewChoice.url(inHome: home))- #expect(choice.save(directory.url.appending(path: "custom/bin/brew")))+ #expect(choice.save(directory.url.appending(path: "custom/bin/brew")) == nil)#expect(HomebrewData.prefixes(home: home, root: root).map(\.lastPathComponent)== ["custom", "homebrew", "local"])- #expect(choice.save(root.appending(path: "usr/local/bin/brew")))+ #expect(choice.save(root.appending(path: "usr/local/bin/brew")) == nil)#expect(HomebrewData.prefixes(home: home, root: root).map(\.lastPathComponent) == ["local", "homebrew"])}diff --git a/Packages/PeelCore/Tests/PeelCoreTests/PeelFolderTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/PeelFolderTests.swiftindex 15bb4265..98450cb4 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/PeelFolderTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/PeelFolderTests.swift@@ -25,7 +25,7 @@ struct PeelFolderTests {FileLock.whileHeld(beside: file("a.json")) {}#expect(AppFolders(url: file("app-folders.json")).add([directory.url]) != .saved)- #expect(!HomebrewChoice(url: file("homebrew.json")).save(nil))+ #expect(HomebrewChoice(url: file("homebrew.json")).save(nil) != nil)#expect(!ShellFile.write(ShellFile.Choices(), to: file("Terminal/zshrc")))#expect(!SSHFile.write([], to: file("Terminal/ssh_config")))await ReleaseNotesStore(url: file("release-notes.json")).save(ReleaseNotesMemory())@@ -48,7 +48,7 @@ struct PeelFolderTests {let folder = try directory.directory("Peel")PeelFolder.take(folder)- #expect(!HomebrewChoice(url: folder.appending(path: "homebrew.json")).save(nil))+ #expect(HomebrewChoice(url: folder.appending(path: "homebrew.json")).save(nil) != nil)FileLock.whileHeld(beside: folder.appending(path: "a.json")) {}#expect(try FileManager.default.contentsOfDirectory(atPath: folder.path(percentEncoded: false)).isEmpty)@@ -58,7 +58,7 @@ struct PeelFolderTests {let directory = try TemporaryDirectory()PeelFolder.take(directory.url.appending(path: "Peel", directoryHint: .isDirectory))- #expect(HomebrewChoice(url: directory.url.appending(path: "Peel 2/homebrew.json")).save(nil))+ #expect(HomebrewChoice(url: directory.url.appending(path: "Peel 2/homebrew.json")).save(nil) == nil)}@Test func onlyThisFolderWritesAFileOfPeelsWhole() throws {diff --git a/Packages/PeelCore/Tests/PeelCoreTests/SelfRemovalTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/SelfRemovalTests.swiftindex 68f91c3b..38962651 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/SelfRemovalTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/SelfRemovalTests.swift@@ -394,7 +394,7 @@ struct SelfRemovalTests {_ = await SelfRemoval.move([app], app: app, folder: folder, using: try service(in: directory)) { _ in }- #expect(HomebrewChoice(url: folder.appending(path: "homebrew.json")).save(nil))+ #expect(HomebrewChoice(url: folder.appending(path: "homebrew.json")).save(nil) == nil)}@Test func movesTheAppPeelRunsFrom() async throws {diff --git a/Peel/Views/Presentation.swift b/Peel/Views/Presentation.swiftindex 78a5af0d..d3763c8a 100644--- a/Peel/Views/Presentation.swift+++ b/Peel/Views/Presentation.swift@@ -261,13 +261,21 @@ extension AppInspector.Unreadable {extension FileProblem {/// `sentence`, then why the file at `url` couldn't be read or saved.func said(after sentence: String, about url: URL) -> String {- let why = switch self {+ [sentence, why(about: url)].joined(separator: " ")+ }++ /// `sentence`, its Markdown read, then why the file at `url` couldn't be read or saved.+ func said(after sentence: AttributedString, about url: URL) -> AttributedString {+ sentence + AttributedString(" " + why(about: url))+ }++ private func why(about url: URL) -> String {+ switch self {case .notAFile: String(localized: "Something other than a file, such as a folder, is where the file should be.")case .tooLarge: String(localized: "The file is larger than Peel ever writes it, so Peel doesn’t read it.")case .damaged: String(localized: "The file’s contents aren’t in a form Peel can read.")case .failed(let error): String(localized: "macOS answered: \(error.description(of: url))")}- return [sentence, why].joined(separator: " ")}}diff --git a/Peel/Views/Settings/HomebrewSection.swift b/Peel/Views/Settings/HomebrewSection.swiftindex 86787817..b6fc71e7 100644--- a/Peel/Views/Settings/HomebrewSection.swift+++ b/Peel/Views/Settings/HomebrewSection.swift@@ -10,7 +10,7 @@ struct HomebrewSection: View {@State private var isChoosing = false@State private var confirming: URL?@State private var refusal: HomebrewChoice.Refusal?- @State private var couldNotSave = false+ @State private var whyNotSaved: FileProblem?var body: some View {let unrunnable = HomebrewChoice().unrunnable()@@ -46,8 +46,8 @@ struct HomebrewSection: View {.foregroundStyle(.secondary)}}- if couldNotSave {- StatusLabel(title: Text("Peel couldn’t save which `brew` to run."))+ if let whyNotSaved {+ StatusLabel(title: Text(notSaved(whyNotSaved)))}} header: {titled("Homebrew", "Peel runs the `brew` in /opt/homebrew or /usr/local. If your Homebrew is in a folder of its own, such as /opt/brew, choose its `brew`, and Peel and `peel` run that one.")@@ -74,6 +74,10 @@ struct HomebrewSection: View {}}+ private func notSaved(_ why: FileProblem) -> AttributedString {+ why.said(after: AttributedString(localized: "Peel couldn’t save which `brew` to run."), about: HomebrewChoice().url)+ }+private var isShowingRefusal: Binding<Bool> {Binding(get: { refusal != nil }, set: { if !$0 { refusal = nil } })}@@ -83,7 +87,7 @@ struct HomebrewSection: View {}private func use(_ brew: URL?) {- couldNotSave = !HomebrewChoice().save(brew)+ whyNotSaved = HomebrewChoice().save(brew)choice = HomebrewChoice().load()Task { await homebrew.readAnotherBrew() }}