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.

Read Check for app updates the way its switch does

Țugui Dragoș08b548fbcd8a
diff --git a/Packages/PeelCore/Sources/PeelCore/Support/StoredSwitch.swift b/Packages/PeelCore/Sources/PeelCore/Support/StoredSwitch.swift
new file mode 100644
index 00000000..accc2aa4
--- /dev/null
+++ b/Packages/PeelCore/Sources/PeelCore/Support/StoredSwitch.swift
@@ -0,0 +1,9 @@
+public import Foundation
+
+public extension UserDefaults {
+ /// A switch as SwiftUI's `AppStorage` reads it: `whenNeverSet` until a value is stored, then what `bool(forKey:)`
+ /// makes of that value, so one given as text, such as a launch argument's `NO`, reads as the switch shows it.
+ func isOn(_ key: String, whenNeverSet: Bool) -> Bool {
+ object(forKey: key) == nil ? whenNeverSet : bool(forKey: key)
+ }
+}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/StoredSwitchTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/StoredSwitchTests.swift
new file mode 100644
index 00000000..69ae763f
--- /dev/null
+++ b/Packages/PeelCore/Tests/PeelCoreTests/StoredSwitchTests.swift
@@ -0,0 +1,31 @@
+import Foundation
+@testable import PeelCore
+import Testing
+
+@Suite(.serialized)
+struct StoredSwitchTests {
+ private let key = "org.example.peel.storedSwitch"
+
+ private func reading(_ stored: Any?, whenNeverSet: Bool) -> Bool {
+ let defaults = UserDefaults.standard
+ let arguments = defaults.volatileDomain(forName: UserDefaults.argumentDomain)
+ defer { defaults.setVolatileDomain(arguments, forName: UserDefaults.argumentDomain) }
+ var domain = arguments
+ domain[key] = stored
+ defaults.setVolatileDomain(domain, forName: UserDefaults.argumentDomain)
+ return defaults.isOn(key, whenNeverSet: whenNeverSet)
+ }
+
+ @Test func aSwitchGivenAsTextReadsAsTheSwitchShowsIt() {
+ #expect(!reading("NO", whenNeverSet: true))
+ #expect(reading("YES", whenNeverSet: false))
+ #expect(!reading("0", whenNeverSet: true))
+ #expect(!reading(false, whenNeverSet: true))
+ #expect(reading(true, whenNeverSet: false))
+ }
+
+ @Test func aSwitchNeverSetReadsAsItsDefault() {
+ #expect(reading(nil, whenNeverSet: true))
+ #expect(!reading(nil, whenNeverSet: false))
+ }
+}
diff --git a/Peel/Model/AppLibrary.swift b/Peel/Model/AppLibrary.swift
index b6cf52ad..8fad6382 100644
--- a/Peel/Model/AppLibrary.swift
+++ b/Peel/Model/AppLibrary.swift
@@ -501,7 +501,7 @@ final class AppLibrary {
func checkForUpdates(_ targets: [InstalledApp], force: Bool = false) async {
// Read here, where every caller passes. Settings promises that with this off, Peel contacts nothing on
// its own, so even Rescan on an app's page only rescans files.
- guard UserDefaults.standard.object(forKey: SettingsKey.checksForAppUpdates) as? Bool ?? true else { return }
+ guard UserDefaults.standard.isOn(SettingsKey.checksForAppUpdates, whenNeverSet: true) else { return }
let now = Date.now
// An app is checked on a schedule kept by its identifier, so an app with none is left to Homebrew's answer.
let wanted = targets.filter { app in