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
Say when a tweak's value is held where Peel doesn't write
Țugui Dragoșbdaa3e1ea3c6
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstringsindex 8e878a65..b601730f 100644--- a/Localization/Peel/Localizable.xcstrings+++ b/Localization/Peel/Localizable.xcstrings@@ -141153,6 +141153,324 @@}}},+ "Set for every account" : {+ "localizations" : {+ "cs" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Nastaveno pro všechny účty"+ }+ },+ "de" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Für alle Benutzeraccounts festgelegt"+ }+ },+ "es" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Establecido para todas las cuentas"+ }+ },+ "fr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Défini pour tous les comptes"+ }+ },+ "it" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Impostato per ogni account"+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "すべてのアカウント共通の設定"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "모든 계정에 설정됨"+ }+ },+ "nl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Ingesteld voor elke account"+ }+ },+ "pl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Ustawione dla wszystkich kont"+ }+ },+ "pt" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Definido para todas as contas"+ }+ },+ "ro" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Setat pentru toate conturile"+ }+ },+ "ru" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Задано для всех учетных записей"+ }+ },+ "sv" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Inställt för alla konton"+ }+ },+ "tr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Her hesap için ayarlandı"+ }+ },+ "uk" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Задано для всіх облікових записів"+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "已为所有账户设定"+ }+ },+ "zh-Hant" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "已為所有帳號設定"+ }+ }+ }+ },+ "Set for every app" : {+ "localizations" : {+ "cs" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Nastaveno pro všechny aplikace"+ }+ },+ "de" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Für alle Apps festgelegt"+ }+ },+ "es" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Establecido para todas las apps"+ }+ },+ "fr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Défini pour toutes les apps"+ }+ },+ "it" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Impostato per ogni app"+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "すべてのアプリ共通の設定"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "모든 앱에 설정됨"+ }+ },+ "nl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Ingesteld voor elke app"+ }+ },+ "pl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Ustawione dla wszystkich aplikacji"+ }+ },+ "pt" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Definido para todos os apps"+ }+ },+ "ro" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Setat pentru toate aplicațiile"+ }+ },+ "ru" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Задано для всех приложений"+ }+ },+ "sv" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Inställt för alla appar"+ }+ },+ "tr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Her uygulama için ayarlandı"+ }+ },+ "uk" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Задано для всіх програм"+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "已为所有App设定"+ }+ },+ "zh-Hant" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "已為所有App設定"+ }+ }+ }+ },+ "Set for this Mac" : {+ "localizations" : {+ "cs" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Nastaveno pro tento Mac"+ }+ },+ "de" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Für diesen Mac festgelegt"+ }+ },+ "es" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Establecido para este Mac"+ }+ },+ "fr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Défini pour ce Mac"+ }+ },+ "it" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Impostato per questo Mac"+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "このMac固有の設定"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "이 Mac에 설정됨"+ }+ },+ "nl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Ingesteld voor deze Mac"+ }+ },+ "pl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Ustawione dla tego Maca"+ }+ },+ "pt" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Definido para este Mac"+ }+ },+ "ro" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Setat pentru acest Mac"+ }+ },+ "ru" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Задано для этого Mac"+ }+ },+ "sv" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Inställt för den här datorn"+ }+ },+ "tr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Bu Mac için ayarlandı"+ }+ },+ "uk" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Задано для цього Mac"+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "已为这台Mac设定"+ }+ },+ "zh-Hant" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "已為這部Mac設定"+ }+ }+ }+ },"Set in a file your Git settings include" : {"localizations" : {"cs" : {diff --git a/Packages/PeelCore/Sources/PeelCore/Tweaks/Tweak.swift b/Packages/PeelCore/Sources/PeelCore/Tweaks/Tweak.swiftindex aeee16c2..10253017 100644--- a/Packages/PeelCore/Sources/PeelCore/Tweaks/Tweak.swift+++ b/Packages/PeelCore/Sources/PeelCore/Tweaks/Tweak.swift@@ -64,6 +64,17 @@ public struct Tweak: Sendable, Hashable, Identifiable {/// A tweak's current state, as read from the preferences.public struct TweakState: Sendable, Hashable {+ /// Where a value comes from that Peel can't change from the layer it writes, the person's own for any host:+ /// a layer macOS reads before Peel's, or one it falls back to while Peel's holds nothing.+ public enum Elsewhere: Sendable, Hashable {+ /// Set for this Mac alone, which wins over what Peel writes.+ case thisMac+ /// Set for every account of this Mac, by an administrator, while nothing of the person's own stands over it.+ case everyAccount+ /// Set for every app at once, in the global domain, while the tweak belongs to one app's domain.+ case everyApp+ }+/// True when the key holds the value this tweak writes. For a folder or a name tweak, true when the key holds/// a path or a name.public let isOn: Bool@@ -71,11 +82,14 @@ public struct TweakState: Sendable, Hashable {public let isManaged: Bool/// For a folder tweak, the path it holds; for a name tweak, the name.public let text: String?+ /// Where the value in effect comes from when turning the tweak off here would change nothing.+ public let heldElsewhere: Elsewhere?- public init(isOn: Bool, isManaged: Bool, text: String?) {+ public init(isOn: Bool, isManaged: Bool, text: String?, heldElsewhere: Elsewhere? = nil) {self.isOn = isOnself.isManaged = isManagedself.text = text+ self.heldElsewhere = heldElsewhere}public static let unset = TweakState(isOn: false, isManaged: false, text: nil)diff --git a/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakLedger.swift b/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakLedger.swiftindex 895e4467..67972153 100644--- a/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakLedger.swift+++ b/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakLedger.swift@@ -106,9 +106,9 @@ public struct TweakLedger {/// Returns whether Turn All Off should turn `tweak` off. It matches what the tweak's own row offers: a/// switch that is on, or a folder that Peel chose, since only then does the row show Put Back. A managed- /// value is left alone, as the row leaves it.+ /// value, and one held in a layer Peel doesn't write, are left alone, as the row leaves them.public func isOn(_ tweak: Tweak, state: TweakState) -> Bool {- guard !state.isManaged else { return false }+ guard !state.isManaged, state.heldElsewhere == nil else { return false }switch tweak.kind {case .aSwitch, .aSwitchForThisAppAlone: return state.isOncase .folder, .name: return holdsPeelsChange(tweak, stored: state.text)diff --git a/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakStore.swift b/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakStore.swiftindex 51c2417c..63ab28b4 100644--- a/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakStore.swift+++ b/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakStore.swift@@ -43,21 +43,71 @@ public struct TweakStore: Sendable, TweakStoring {synchronizeOnce(tweak.domain)let isManaged = Self.isForced(key, in: tweak.domain)- let read = switch tweak.kind {- case .aSwitchForThisAppAlone: Self.copyStored(key, from: tweak.domain)- case .aSwitch, .folder, .name: Self.copy(key, from: tweak.domain)- }- guard let current = read else {+ let layers = layers(of: tweak)+ // A managed value comes before every layer, and only the "App" functions read it.+ guard let current = isManaged ? Self.copy(key, from: tweak.domain) : layers.inEffect else {return TweakState(isOn: false, isManaged: isManaged, text: nil)}+ let isOn: Bool+ var text: String?switch tweak.kind {case .aSwitch(let wanted), .aSwitchForThisAppAlone(let wanted):- return TweakState(isOn: Self.matches(current, wanted), isManaged: isManaged, text: nil)+ isOn = Self.matches(current, wanted)case .folder, .name:- let text = current as? String- return TweakState(isOn: text?.isEmpty == false, isManaged: isManaged, text: text)+ text = current as? String+ isOn = text?.isEmpty == false}+ let elsewhere = isManaged ? nil : Self.heldElsewhere(of: tweak.kind, isOn: isOn, in: layers)+ return TweakState(isOn: isOn, isManaged: isManaged, text: text, heldElsewhere: elsewhere)+ }++ /// What each layer macOS searches holds for a key, in the order it searches them. The layer Peel writes is+ /// the person's own for any host; a value set for this Mac alone comes before it, and the layers of every+ /// account and, for a key of an app's domain, of the global domain come after it.+ struct Layers {+ var thisMac: CFPropertyList?+ var own: CFPropertyList?+ var everyAccount: CFPropertyList?+ var everyApp: CFPropertyList?++ var inEffect: CFPropertyList? { thisMac ?? own ?? everyAccount ?? everyApp }+ }++ private func layers(of tweak: Tweak) -> Layers {+ let key = tweak.key as CFString+ let domain = Self.domain(tweak.domain)+ func value(_ user: CFString, _ host: CFString, in domain: CFString) -> CFPropertyList? {+ CFPreferencesCopyValue(key, domain, user, host)+ }+ var layers = Layers(+ thisMac: value(kCFPreferencesCurrentUser, kCFPreferencesCurrentHost, in: domain),+ own: value(kCFPreferencesCurrentUser, kCFPreferencesAnyHost, in: domain)+ )+ // A switch for one app alone never reads past the person's own layers of that app.+ if case .aSwitchForThisAppAlone = tweak.kind { return layers }+ layers.everyAccount = value(kCFPreferencesAnyUser, kCFPreferencesCurrentHost, in: domain)+ ?? value(kCFPreferencesAnyUser, kCFPreferencesAnyHost, in: domain)+ if tweak.domain != Self.globalDomain {+ synchronizeOnce(Self.globalDomain)+ let global = kCFPreferencesAnyApplication+ layers.everyApp = value(kCFPreferencesCurrentUser, kCFPreferencesCurrentHost, in: global)+ ?? value(kCFPreferencesCurrentUser, kCFPreferencesAnyHost, in: global)+ ?? value(kCFPreferencesAnyUser, kCFPreferencesCurrentHost, in: global)+ ?? value(kCFPreferencesAnyUser, kCFPreferencesAnyHost, in: global)+ }+ return layers+ }++ /// Where the value in effect comes from when Peel can't change it from its own layer: a value set for this+ /// Mac alone wins over Peel's whatever it holds, and a switch read as on from a layer macOS falls back to,+ /// with nothing of Peel's over it, could not be turned off, since removing Peel's key would change nothing.+ /// A value Peel's own would win over, and a folder or a name, which Peel writes over it, are nobody else's.+ static func heldElsewhere(of kind: Tweak.Kind, isOn: Bool, in layers: Layers) -> TweakState.Elsewhere? {+ if layers.thisMac != nil { return .thisMac }+ guard layers.own == nil, case .aSwitch = kind, isOn else { return nil }+ if layers.everyAccount != nil { return .everyAccount }+ return layers.everyApp != nil ? .everyApp : nil}/// Returns what the key holds in the layer Peel writes (this user, any host), so it can be put back exactlydiff --git a/Packages/PeelCore/Tests/PeelCoreTests/TweakLedgerTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/TweakLedgerTests.swiftindex 6f204b88..000ae6da 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/TweakLedgerTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/TweakLedgerTests.swift@@ -136,6 +136,8 @@ struct TweakLedgerTests {#expect(!ledger.isOn(folder, state: chosenByHand))#expect(!ledger.isOn(aSwitch, state: TweakState(isOn: true, isManaged: true, text: nil)))+ let heldForThisMac = TweakState(isOn: true, isManaged: false, text: nil, heldElsewhere: .thisMac)+ #expect(!ledger.isOn(aSwitch, state: heldForThisMac))let store = FakeStore()_ = ledger.turnOn(folder, text: "/Users/me/Peel", in: store)#expect(ledger.isOn(folder, state: TweakState(isOn: true, isManaged: false, text: "/Users/me/Peel")))diff --git a/Packages/PeelCore/Tests/PeelCoreTests/TweakTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/TweakTests.swiftindex 2a9451f0..d7581f5c 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/TweakTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/TweakTests.swift@@ -123,6 +123,34 @@ struct TweakTests {#expect(!TweakStore.matches("zero" as CFString, .number(0)))}+ /// A value Peel can't change from the layer it writes is named by where it comes from: a value set for this+ /// Mac alone wins over Peel's, and a switch on from an administrator's file or from the global domain, with+ /// nothing of Peel's over it, could not be turned off. A value Peel's own would win over is nobody else's.+ @Test func tellsWhereAValueComesFromThatPeelCannotChange() {+ let aSwitch = Tweak.Kind.aSwitch(.boolean(true))+ let forThisApp = Tweak.Kind.aSwitchForThisAppAlone(.boolean(true))+ func layers(+ thisMac: Bool = false, own: Bool = false, account: Bool = false, app: Bool = false+ ) -> TweakStore.Layers {+ TweakStore.Layers(+ thisMac: thisMac ? true as CFBoolean : nil, own: own ? true as CFBoolean : nil,+ everyAccount: account ? true as CFBoolean : nil, everyApp: app ? true as CFBoolean : nil+ )+ }++ #expect(TweakStore.heldElsewhere(of: aSwitch, isOn: true, in: layers(thisMac: true)) == .thisMac)+ #expect(TweakStore.heldElsewhere(of: aSwitch, isOn: false, in: layers(thisMac: true, own: true)) == .thisMac)+ #expect(TweakStore.heldElsewhere(of: aSwitch, isOn: true, in: layers(own: true, account: true)) == nil)+ #expect(TweakStore.heldElsewhere(of: aSwitch, isOn: true, in: layers(account: true)) == .everyAccount)+ #expect(TweakStore.heldElsewhere(of: aSwitch, isOn: true, in: layers(app: true)) == .everyApp)+ #expect(TweakStore.heldElsewhere(of: aSwitch, isOn: false, in: layers(account: true)) == nil)+ #expect(TweakStore.heldElsewhere(of: aSwitch, isOn: false, in: layers()) == nil)+ #expect(TweakStore.heldElsewhere(of: .folder, isOn: true, in: layers(account: true)) == nil)+ #expect(TweakStore.heldElsewhere(of: .folder, isOn: true, in: layers(thisMac: true)) == .thisMac)+ #expect(TweakStore.heldElsewhere(of: forThisApp, isOn: true, in: layers(account: true)) == nil)+ #expect(TweakStore.heldElsewhere(of: forThisApp, isOn: true, in: layers(thisMac: true)) == .thisMac)+ }+@Test func callsTheGlobalDomainWhatTheApiCallsIt() {#expect(TweakStore.domain("NSGlobalDomain") == kCFPreferencesAnyApplication)#expect(TweakStore.domain("com.apple.dock") == "com.apple.dock" as CFString)@@ -151,6 +179,11 @@ struct TweakTests {for tweak in TweakCatalog.all {let live = store.state(of: tweak)#expect(!live.isOn || live.isManaged || store.storedValue(of: tweak) != nil || live.text != nil, "\(tweak.id) reads as on with nothing stored")+ // A value from an administrator's file or the global domain counts as held elsewhere only while Peel's+ // own layer holds nothing, since Peel's would win over it.+ if let elsewhere = live.heldElsewhere, elsewhere != .thisMac {+ #expect(store.storedValue(of: tweak) == nil, "\(tweak.id) is held \(elsewhere) over Peel's own value")+ }}}diff --git a/Peel/Model/TweakLibrary.swift b/Peel/Model/TweakLibrary.swiftindex fa656bdb..325eb8ca 100644--- a/Peel/Model/TweakLibrary.swift+++ b/Peel/Model/TweakLibrary.swift@@ -254,6 +254,16 @@ extension Tweak.Group {}}+extension TweakState.Elsewhere {+ var words: LocalizedStringResource {+ switch self {+ case .thisMac: "Set for this Mac"+ case .everyAccount: "Set for every account"+ case .everyApp: "Set for every app"+ }+ }+}+extension Tweak.Restart {var note: LocalizedStringResource? {switch self {diff --git a/Peel/Views/Tweaks/TweakDetailView.swift b/Peel/Views/Tweaks/TweakDetailView.swiftindex 3d4f2631..f735d4a7 100644--- a/Peel/Views/Tweaks/TweakDetailView.swift+++ b/Peel/Views/Tweaks/TweakDetailView.swift@@ -112,8 +112,8 @@ struct TweakRow: View {return paragraphs.joined(separator: "\n\n")}- /// A label for a setting Peel can't change: one locked by a configuration profile, or one whose last write- /// macOS refused.+ /// A label for a setting Peel can't change: one locked by a configuration profile, one held in a layer of+ /// the preferences Peel doesn't write, or one whose last write macOS refused.@ViewBuilderprivate func standing(_ state: TweakState) -> some View {if state.isManaged {@@ -121,6 +121,11 @@ struct TweakRow: View {.labelStyle(.titleAndIcon).font(.caption).foregroundStyle(.secondary)+ } else if let elsewhere = state.heldElsewhere {+ StatusLabel(title: Text(elsewhere.words), systemImage: "lock", tint: .accentColor)+ .labelStyle(.titleAndIcon)+ .font(.caption)+ .foregroundStyle(.secondary)} else if tweaks.refused.contains(tweak.id) {// Explains why the switch went back after macOS refused the write.StatusLabel(title: Text("macOS refused it"), tint: .accentColor)@@ -132,6 +137,8 @@ struct TweakRow: View {@ViewBuilderprivate func control(_ state: TweakState, works: Bool) -> some View {+ // Nothing here changes a value a profile locks or another layer of the preferences holds.+ let isHeld = state.isManaged || state.heldElsewhere != nilswitch tweak.kind {case .aSwitch, .aSwitchForThisAppAlone:let isOn = Binding(@@ -140,14 +147,14 @@ struct TweakRow: View {)if #available(macOS 27, *) {RowSwitch(title: Text(tweak.words.title), isOn: isOn)- .disabled(state.isManaged || !works)+ .disabled(isHeld || !works)} else {Toggle(isOn: isOn) { EmptyView() }.labelsHidden().accessibilityRepresentation {Toggle(isOn: isOn) { Text(tweak.words.title) }}- .disabled(state.isManaged || !works)+ .disabled(isHeld || !works)}case .folder:// The folder row has no switch to turn off, so Put Back is how the user undoes Peel's change.@@ -159,7 +166,7 @@ struct TweakRow: View {}.buttonStyle(.bordered).controlSize(.small)- .disabled(state.isManaged)+ .disabled(isHeld).accessibilityLabel(Text("Put back the screenshot folder")).transition(.opacity)}@@ -168,12 +175,13 @@ struct TweakRow: View {}.buttonStyle(.bordered).controlSize(.small)- .disabled(state.isManaged)+ .disabled(isHeld).accessibilityLabel(Text("Choose the folder for screenshots"))}.motion(value: tweaks.isChangedByPeel(tweak))case .name:TweakNameField(tweak: tweak, state: state, problem: $nameProblem)+ .disabled(isHeld)}}}@@ -221,7 +229,6 @@ private struct TweakNameField: View {.accessibilityLabel(putsBack ? Text("Put back the screenshot name") : Text("Save the screenshot name")).motion(value: putsBack)}- .disabled(state.isManaged)}private var isEdited: Bool {