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.

Draw Settings' login item and Finder extension only once known

Țugui Dragoș2dbe81d81591
diff --git a/Packages/PeelCore/Sources/PeelCore/Home/LoginItem.swift b/Packages/PeelCore/Sources/PeelCore/Home/LoginItem.swift
index 203bc497..bc9401a3 100644
--- a/Packages/PeelCore/Sources/PeelCore/Home/LoginItem.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Home/LoginItem.swift
@@ -42,6 +42,9 @@ public final class LoginItem {
asked ?? Self.isOn(status)
}
+ /// Whether macOS has said what the item is, or the person has just set it. Until then `isOn` is no fact.
+ public var isKnown: Bool { status != nil || asked != nil }
+
public var needsApproval: Bool {
status == .requiresApproval
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/LoginItemTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/LoginItemTests.swift
index 34ed5c10..2632f692 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/LoginItemTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/LoginItemTests.swift
@@ -4,6 +4,16 @@ import Testing
@MainActor
struct LoginItemTests {
+ @Test func isNotKnownUntilMacOSAnswers() async {
+ let item = LoginItem(read: { .enabled }, change: { _ in LoginItem.Answer(status: .enabled) })
+
+ let before = item.isKnown
+ await item.refresh()
+
+ #expect(!before)
+ #expect(item.isKnown && item.isOn)
+ }
+
@Test func keepsWhatTheSwitchWasSetToUntilMacOSAnswers() async {
var release: CheckedContinuation<Void, Never>?
let item = LoginItem(read: { .notRegistered }) { on in
diff --git a/Peel/Views/Settings/SettingsView.swift b/Peel/Views/Settings/SettingsView.swift
index d73278f4..a39a7f31 100644
--- a/Peel/Views/Settings/SettingsView.swift
+++ b/Peel/Views/Settings/SettingsView.swift
@@ -298,6 +298,7 @@ private struct GeneralSettingsView: View {
// A binding, not `onChange`: macOS's own answer landing in the model must not register again.
toggle("Open Peel at login", isOn: Binding(get: { home.loginItem.isOn }, set: { home.loginItem.set(on: $0) }),
"Starts Peel when you log in. “Watch the Trash” works only while Peel is running.")
+ .disabled(!home.loginItem.isKnown)
if home.loginItem.needsApproval {
HStack {
StatusLabel(title: Text("Peel is turned off in Login Items & Extensions, so macOS won’t start it."))
@@ -338,9 +339,13 @@ private struct GeneralSettingsView: View {
let isOn = home.state(of: .finderExtension) == .on
HStack(spacing: 5) {
Text("Finder extension")
- state(isOn ? "On" : home.isFinderExtensionFromAnotherCopy ? "On in another copy of Peel" : "Off",
- isOn ? "checkmark.circle" : "minus.circle",
- isOn ? .green : .secondary)
+ if home.hasChecked {
+ state(isOn ? "On" : home.isFinderExtensionFromAnotherCopy ? "On in another copy of Peel" : "Off",
+ isOn ? "checkmark.circle" : "minus.circle",
+ isOn ? .green : .secondary)
+ } else {
+ state("Checking…", "hourglass", .secondary)
+ }
InfoNote(
name: String(localized: "Finder extension"),
detail: Text("Control-click an app in Finder and choose Uninstall with Peel to see what it leaves behind.")