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
Show on Home at once the login item Settings switched
Țugui Dragoș7663c5d13d2d
diff --git a/Peel/Model/HomeModel.swift b/Peel/Model/HomeModel.swiftindex 2c21dc94..cbf56c1f 100644--- a/Peel/Model/HomeModel.swift+++ b/Peel/Model/HomeModel.swift@@ -117,8 +117,12 @@ final class HomeModel {private(set) var hasChecked = falseprivate let frontmost = FrontmostApp.shared- init(helper: HelperModel) {+ /// The login item Settings switches too, so Home shows each change as it lands.+ let loginItem: LoginItem++ init(helper: HelperModel, loginItem: LoginItem = .ofTheMainApp()) {self.helper = helper+ self.loginItem = loginItemappManagement = AccessState(stored: UserDefaults.standard.string(forKey: Self.appManagementKey))}@@ -128,6 +132,9 @@ final class HomeModel {if hasChecked {states[.helper] = helperState}+ if let status = loginItem.status {+ states[.openAtLogin] = status == .enabled ? .on : .off+ }return states}@@ -184,13 +191,12 @@ final class HomeModel {needsRelaunchForFullDiskAccess = FullDiskAccess.offersReopen(fullDisk, systemSettingsWasInFront: frontmost.hasShownSystemSettings)- let opensAtLogin = await LoginItem.status() == .enabled+ await loginItem.refresh()found = [.fullDiskAccess: state(for: fullDisk),.appManagement: state(for: appManagementSeenThisLaunch ?? appManagement),.notifications: notificationStatus == .authorized ? .on : .off,.finderExtension: isFinderExtensionEnabled ? .on : .off,- .openAtLogin: opensAtLogin ? .on : .off,.commandLine: Self.commandLineState(isOnThePath: CommandLineTool.isOnThePath(embedded: Bundle.main.bundleURL.appending(path: "Contents/Helpers/peel")diff --git a/Peel/Views/Settings/SettingsView.swift b/Peel/Views/Settings/SettingsView.swiftindex 36aa440e..8526f4b0 100644--- a/Peel/Views/Settings/SettingsView.swift+++ b/Peel/Views/Settings/SettingsView.swift@@ -217,7 +217,6 @@ private struct GeneralSettingsView: View {// The widest tool symbol at the body size, so the titles of the tools line up.@ScaledMetric(relativeTo: .body) private var toolSymbolWidth = 20.0@State private var isConfirmingSelfRemoval = false- @State private var loginItem = LoginItem.ofTheMainApp()private func readStandings() {commandLine = HomeModel.commandLineStanding@@ -294,9 +293,9 @@ private struct GeneralSettingsView: View {notificationsOff(Text("Peel isn’t allowed to send notifications, so it can’t warn you when the disk is almost full."))}// A binding, not `onChange`: macOS's own answer landing in the model must not register again.- toggle("Open Peel at login", isOn: Binding(get: { loginItem.isOn }, set: { loginItem.set(on: $0) }),+ 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.")- if loginItem.needsApproval {+ if home.loginItem.needsApproval {HStack {StatusLabel(title: Text("Peel is turned off in Login Items & Extensions, so macOS won’t start it."))Spacer()@@ -305,7 +304,7 @@ private struct GeneralSettingsView: View {}}}- if let failure = loginItem.failure {+ if let failure = home.loginItem.failure {StatusLabel(title: Text(failure)).textSelection(.enabled)}@@ -459,12 +458,12 @@ private struct GeneralSettingsView: View {}.task {readStandings()- await loginItem.refresh()+ await home.loginItem.refresh()}.onReceive(NotificationCenter.default.publisher(for: NSApplication.didBecomeActiveNotification)) { _ in// The user may have changed the login item in System Settings, or a saved copy in Finder.readStandings()- Task { await loginItem.refresh() }+ Task { await home.loginItem.refresh() }}.confirmationDialog("Remove Peel from this Mac?", isPresented: $isConfirmingSelfRemoval) {Button("Remove Peel", role: .destructive) {diff --git a/PeelTests/HomeLoginItemTests.swift b/PeelTests/HomeLoginItemTests.swiftnew file mode 100644index 00000000..b2f25374--- /dev/null+++ b/PeelTests/HomeLoginItemTests.swift@@ -0,0 +1,22 @@+@testable import Peel+import PeelCore+import ServiceManagement+import Testing++@MainActor+struct HomeLoginItemTests {+ @Test func homeShowsWhatSettingsTurnedOn() async {+ let item = LoginItem(read: { .notRegistered }) { on in+ LoginItem.Answer(status: on ? .enabled : .notRegistered)+ }+ let home = HomeModel(helper: HelperModel(), loginItem: item)+ await item.refresh()+ let before = home.state(of: .openAtLogin)++ item.set(on: true)+ while item.status != .enabled { await Task.yield() }++ #expect(before == .off)+ #expect(home.state(of: .openAtLogin) == .on)+ }+}