Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Ask for Update Homebrew above lists read before its definitions went

Țugui Dragoș5a72f84400cd
diff --git a/Peel/Views/Homebrew/HomebrewList.swift b/Peel/Views/Homebrew/HomebrewList.swift
index c67b2e18..d9f9fdb7 100644
--- a/Peel/Views/Homebrew/HomebrewList.swift
+++ b/Peel/Views/Homebrew/HomebrewList.swift
@@ -22,6 +22,11 @@ struct HomebrewList: View {
let outdated = homebrew.outdated
List(selection: $homebrew.selection) {
+ let needsDefinitions = homebrew.needsDefinitions
+ if searchText.isEmpty, homebrew.isInstalled,
+ Self.asksToUpdateAboveTheLists(needsDefinitions: needsDefinitions, packages: homebrew.packages) {
+ updateFirst
+ }
// While searching, the page lists only the matching packages and hides every other section.
if searchText.isEmpty, homebrew.isInstalled, !homebrew.needsDefinitions {
if let anotherAccount = homebrew.belongsToAnotherAccount {
@@ -399,6 +404,32 @@ struct HomebrewList: View {
}
}
+ /// Whether the page asks for Update Homebrew above lists it read before Homebrew's own definitions went: with no
+ /// list read, the page holds only that question.
+ static func asksToUpdateAboveTheLists(needsDefinitions: Bool, packages: [HomebrewPackage]?) -> Bool {
+ needsDefinitions && packages?.isEmpty == false
+ }
+
+ @ViewBuilder
+ private var updateFirst: some View {
+ if let anotherAccount = homebrew.belongsToAnotherAccount {
+ Notice(title: Text("Homebrew Belongs to Another Account"), detail: Text(anotherAccount), kind: .note) {}
+ .padding(.vertical, 6)
+ .listRowSeparator(.hidden)
+ } else {
+ Notice(
+ title: Text("Homebrew Has to Update First"),
+ detail: Text("Homebrew’s own list of packages isn’t on this Mac, so asking it about packages would download the list again. Peel doesn’t start that on its own."),
+ kind: .note
+ ) {
+ Button("Update Homebrew") { start(.update) }
+ .disabled(isBusy)
+ }
+ .padding(.vertical, 6)
+ .listRowSeparator(.hidden)
+ }
+ }
+
private func count(of kind: HomebrewPackage.Kind) -> Text {
guard let count = homebrew.count(of: kind) else {
return Text(verbatim: String(localized: "Unknown (Homebrew count)", defaultValue: "Unknown"))
diff --git a/PeelTests/HomebrewUpdateFirstTests.swift b/PeelTests/HomebrewUpdateFirstTests.swift
new file mode 100644
index 00000000..0b7c553c
--- /dev/null
+++ b/PeelTests/HomebrewUpdateFirstTests.swift
@@ -0,0 +1,15 @@
+import Foundation
+@testable import Peel
+import PeelCore
+import Testing
+
+@MainActor
+struct HomebrewUpdateFirstTests {
+ @Test func asksForAnUpdateAboveListsReadBeforeTheDefinitionsWent() {
+ let read = [HomebrewPackage(name: "wget", kind: .formula, installedVersion: "1.25")]
+
+ #expect(HomebrewList.asksToUpdateAboveTheLists(needsDefinitions: true, packages: read))
+ #expect(!HomebrewList.asksToUpdateAboveTheLists(needsDefinitions: true, packages: []))
+ #expect(!HomebrewList.asksToUpdateAboveTheLists(needsDefinitions: false, packages: read))
+ }
+}