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
Name the folder a tool is in when Peel won't run the brew under it
Țugui Dragoșe13de7be3467
diff --git a/Peel/Model/TerminalToolLibrary.swift b/Peel/Model/TerminalToolLibrary.swiftindex 99d4b59a..887a7cfe 100644--- a/Peel/Model/TerminalToolLibrary.swift+++ b/Peel/Model/TerminalToolLibrary.swift@@ -9,6 +9,12 @@ final class TerminalToolLibrary {var installed: Set<TerminalTool>var unrunnable: HomebrewChoice.Unrunnable?var refused: HomebrewChoice.Unrunnable?++ /// Where the tools are: under the `brew` Peel runs, or under one it won't run, which it never asks, since that+ /// a tool is there is only a look at a folder.+ var folder: URL? {+ prefix ?? (refused ?? unrunnable)?.brew.deletingLastPathComponent().deletingLastPathComponent()+ }}struct Catalog {@@ -47,13 +53,11 @@ final class TerminalToolLibrary {await askingHomebrew?.value}- /// What is on the disk under the `brew` Peel runs, or under one it won't run, which it never asks: that a tool is- /// installed is only a look at a folder.static func installed(prefix: URL?, refused: HomebrewChoice.Unrunnable?, unrunnable: HomebrewChoice.Unrunnable?) -> Set<TerminalTool> {- let brew = (refused ?? unrunnable)?.brew- guard let folder = prefix ?? brew?.deletingLastPathComponent().deletingLastPathComponent() else { return [] }+ let state = State(prefix: prefix, installed: [], unrunnable: unrunnable, refused: refused)+ guard let folder = state.folder else { return [] }return Set(TerminalTool.allCases.filter { $0.isInstalled(prefix: folder) })}diff --git a/Peel/Views/Terminal/ToolsTab.swift b/Peel/Views/Terminal/ToolsTab.swiftindex 2852c7a8..efa8bb3e 100644--- a/Peel/Views/Terminal/ToolsTab.swift+++ b/Peel/Views/Terminal/ToolsTab.swift@@ -116,7 +116,7 @@ private struct TerminalToolRow: View {.foregroundStyle(.secondary).fixedSize(horizontal: false, vertical: true)case .available?:- let setups = tool.setup(prefix: state.prefix ?? Self.defaultPrefix)+ let setups = tool.setup(prefix: state.folder ?? Self.defaultPrefix)if !isInstalled || !setups.isEmpty {let title: LocalizedStringKey =if isInstalled { "Set up" } else if setups.isEmpty { "Install" } else { "Install and set up" }diff --git a/PeelTests/TerminalLibrariesTests.swift b/PeelTests/TerminalLibrariesTests.swiftindex 35247e52..e2069ee5 100644--- a/PeelTests/TerminalLibrariesTests.swift+++ b/PeelTests/TerminalLibrariesTests.swift@@ -231,6 +231,23 @@ struct TerminalLibrariesTests {#expect(TerminalToolLibrary.installed(prefix: nil, refused: nil, unrunnable: nil).isEmpty)}+ @Test func aToolsLinesNameTheFolderOfTheBrewPeelWontRun() {+ let refused = HomebrewChoice.Unrunnable(+ brew: URL(filePath: "/org.example/brew/bin/brew"), refusal: .ownedByAnotherAccount+ )+ let running = URL(filePath: "/org.example/other/", directoryHint: .isDirectory)+ typealias Brew = HomebrewChoice.Unrunnable+ func folder(_ prefix: URL?, _ refused: Brew?, _ unrunnable: Brew?) -> String? {+ TerminalToolLibrary.State(prefix: prefix, installed: [], unrunnable: unrunnable, refused: refused)+ .folder?.path(percentEncoded: false)+ }++ #expect(folder(nil, refused, nil) == "/org.example/brew/")+ #expect(folder(nil, nil, refused) == "/org.example/brew/")+ #expect(folder(running, refused, nil) == "/org.example/other/")+ #expect(folder(nil, nil, nil) == nil)+ }+@Test func aToolsAvailabilityIsNotKnownWhileHomebrewIsAsked() {let fzf = HomebrewPackage(name: "fzf", kind: .formula)let catalog = TerminalToolLibrary.Catalog(known: ["fzf"], packages: [fzf])