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.

Forget a change of Peel's as soon as its key holds something else

Țugui Dragoș3cb596bb0314
diff --git a/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakLedger.swift b/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakLedger.swift
index 405bb396..71c92939 100644
--- a/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakLedger.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakLedger.swift
@@ -84,6 +84,16 @@ public struct TweakLedger {
return Self.isSame(before, store.storedValue(of: tweak)) ? .unchanged : .changed
}
+ /// Forgets each change of Peel's whose key no longer holds what Peel wrote, and answers whether any went: the key
+ /// was changed outside Peel, so if it comes to hold that value again, that is the person's doing too.
+ public mutating func forgetChangesNoLongerHeld(in store: some TweakStoring) -> Bool {
+ let gone = TweakCatalog.all.filter {
+ changedByPeel.contains($0.id) && !holdsPeelsChange($0, stored: store.storedValue(of: $0))
+ }
+ gone.forEach { forget($0) }
+ return !gone.isEmpty
+ }
+
/// Drops what `tweak`'s key held before Peel changed it, so turning the tweak off hands the setting to macOS
/// instead of putting that back: for a folder that can no longer take screenshots.
public mutating func forgetPreviousValue(of tweak: Tweak) {
diff --git a/Peel/Model/TweakLibrary.swift b/Peel/Model/TweakLibrary.swift
index 1cd8f26f..4228f9e1 100644
--- a/Peel/Model/TweakLibrary.swift
+++ b/Peel/Model/TweakLibrary.swift
@@ -76,6 +76,7 @@ final class TweakLibrary {
/// calls this each time Peel becomes active rather than trusting what it read before.
func refresh() {
store.beginReading()
+ if ledger.forgetChangesNoLongerHeld(in: store) { save() }
states = Dictionary(
TweakCatalog.all.map { ($0.id, store.state(of: $0)) },
uniquingKeysWith: { first, _ in first }
diff --git a/PeelTests/TweakLibraryTests.swift b/PeelTests/TweakLibraryTests.swift
index 64c3aa54..fb509d29 100644
--- a/PeelTests/TweakLibraryTests.swift
+++ b/PeelTests/TweakLibraryTests.swift
@@ -141,6 +141,25 @@ struct TweakLibraryTests {
#expect(library.foldersLeftToMacOS.isEmpty)
}
+ @Test func aChangeOfPeelsTheKeyNoLongerHoldsIsForgottenAsSoonAsItIsSeen() async throws {
+ let store = FakeTweakStore()
+ let tweak = try #require(Self.quiet.first { if case .aSwitch = $0.kind { true } else { false } })
+ let (library, made) = try makeLibrary(store: store)
+ defer { made.forget() }
+ await library.set(tweak, on: true).value
+ #expect(library.isChangedByPeel(tweak))
+ let peelsValue = store.values[tweak.id]
+
+ store.values[tweak.id] = nil
+ library.refresh()
+ store.values[tweak.id] = peelsValue
+ library.refresh()
+
+ #expect(!library.isChangedByPeel(tweak), "the last hand on the key was the person's")
+ let reopened = TweakLibrary(store: store, defaults: made.defaults, restart: { _ in })
+ #expect(!reopened.isChangedByPeel(tweak))
+ }
+
@Test func twoRefusedSwitchesBothSaySo() async throws {
let store = FakeTweakStore()
let (library, made) = try makeLibrary(store: store)