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.

Save the Git ledger after each key, and let a quit wait for the change

Țugui Dragoș3c5faaef5e45
diff --git a/Packages/PeelCore/Sources/PeelCore/Terminal/GitLedger.swift b/Packages/PeelCore/Sources/PeelCore/Terminal/GitLedger.swift
index 3034ff86..37c866da 100644
--- a/Packages/PeelCore/Sources/PeelCore/Terminal/GitLedger.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Terminal/GitLedger.swift
@@ -20,7 +20,11 @@ public struct GitLedger {
["previous": previous, "written": written]
}
- public mutating func turnOn(_ setting: GitSetting, signingKey: String?, in config: GitConfig) async -> Outcome {
+ /// Turns `setting` on through Git, and hands the ledger to `saving` after each key it takes in, so what a key
+ /// held before is kept even if Peel ends before the setting's other keys are written.
+ public mutating func turnOn(
+ _ setting: GitSetting, signingKey: String?, in config: GitConfig, saving: (GitLedger) -> Void = { _ in }
+ ) async -> Outcome {
let values = setting.values(signingKey: signingKey)
guard !values.isEmpty, let settings = await config.settings() else { return .refused }
guard !setting.isSetInIncludedFiles(await config.keysSetByIncludedFiles()) else { return .unchanged }
@@ -41,11 +45,16 @@ public struct GitLedger {
}
}
written[name] = wanted.value
+ saving(self)
}
return outcome
}
- public mutating func turnOff(_ setting: GitSetting, in config: GitConfig) async -> Outcome {
+ /// Turns `setting` off, putting back what the ledger holds, and hands the ledger to `saving` after each key it
+ /// lets go of.
+ public mutating func turnOff(
+ _ setting: GitSetting, in config: GitConfig, saving: (GitLedger) -> Void = { _ in }
+ ) async -> Outcome {
guard let settings = await config.settings() else { return .refused }
var outcome = Outcome.unchanged
for key in setting.keys {
@@ -63,6 +72,7 @@ public struct GitLedger {
}
written.removeValue(forKey: name)
previous.removeValue(forKey: name)
+ saving(self)
} else if setting.switchKeys.contains(key), now != nil {
guard await config.remove(key) else { return .refused }
outcome = .changed
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/GitSettingsTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/GitSettingsTests.swift
index a91bac74..39cd8d48 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/GitSettingsTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/GitSettingsTests.swift
@@ -134,6 +134,18 @@ struct GitSettingsTests {
#expect(ledger.written.isEmpty && ledger.previous.isEmpty)
}
+ @Test func theLedgerIsHandedOverAfterEveryKeyItChanges() async throws {
+ let git = try await GitHome()
+ let key = try git.publicKey("id_ed25519.pub")
+ var ledger = GitLedger()
+ var handed: [Int] = []
+ _ = await ledger.turnOn(.signCommits, signingKey: key, in: git.config) { handed.append($0.written.count) }
+ #expect(handed == [1, 2, 3])
+ handed = []
+ _ = await ledger.turnOff(.signCommits, in: git.config) { handed.append($0.written.count) }
+ #expect(handed == [2, 1, 0])
+ }
+
@Test func everyWayGitWritesTrueCountsAsOn() {
for written in ["true", "TRUE", "yes", "on", "1"] {
#expect(GitSetting.pruneOnFetch.isOn(in: ["fetch.prune": written]), "\(written)")
diff --git a/Peel/Model/GitLibrary.swift b/Peel/Model/GitLibrary.swift
index 801bda2d..82e16d3f 100644
--- a/Peel/Model/GitLibrary.swift
+++ b/Peel/Model/GitLibrary.swift
@@ -81,6 +81,10 @@ final class GitLibrary {
}
}
+ private static func save(_ ledger: GitLedger) {
+ UserDefaults.standard.set(ledger.stored, forKey: ledgerKey)
+ }
+
private func ask(_ settings: [GitSetting], isOn: Bool) {
for setting in settings {
asked[setting] = isOn
@@ -99,19 +103,22 @@ final class GitLibrary {
return task
}
+ /// Changes the settings through Git, saving the ledger after each key, and a quit asked meanwhile waits: ended
+ /// between a key Git wrote and the ledger's note of what it held, the note would be lost.
private func change(_ settings: [GitSetting], to isOn: Bool) async {
if let git {
- var ledger = ledger
- var refused = false
- for setting in settings {
- let outcome = isOn
- ? await ledger.turnOn(setting, signingKey: state?.signingKey, in: git)
- : await ledger.turnOff(setting, in: git)
- refused = outcome == .refused || refused
+ await QuitGuard.shared.run {
+ var ledger = ledger
+ var refused = false
+ for setting in settings {
+ let outcome = isOn
+ ? await ledger.turnOn(setting, signingKey: state?.signingKey, in: git) { Self.save($0) }
+ : await ledger.turnOff(setting, in: git) { Self.save($0) }
+ refused = outcome == .refused || refused
+ }
+ self.ledger = ledger
+ wasRefused = refused
}
- self.ledger = ledger
- UserDefaults.standard.set(ledger.stored, forKey: Self.ledgerKey)
- wasRefused = refused
await read()
}
for setting in settings {