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.

Keep a Git switch where it was clicked

Țugui Dragoș128f0dfd6acb
diff --git a/Peel/Model/GitLibrary.swift b/Peel/Model/GitLibrary.swift
index ed296b0e..13b0b59f 100644
--- a/Peel/Model/GitLibrary.swift
+++ b/Peel/Model/GitLibrary.swift
@@ -16,14 +16,22 @@ final class GitLibrary {
private var ledger = GitLedger(stored: UserDefaults.standard.dictionary(forKey: ledgerKey) ?? [:])
private var git: GitConfig?
private(set) var state: State?
- private(set) var isWorking = false
+ private var asked: [GitSetting: Bool] = [:]
private(set) var wasRefused = false
+ private var waiting: [GitSetting: Int] = [:]
+ private var changes: Task<Void, Never>?
var hasSomethingOn: Bool {
GitSetting.allCases.contains(where: isOn)
}
func refresh() async {
+ await afterTheOthers {
+ await self.read()
+ }.value
+ }
+
+ private func read() async {
let git = if let git { git } else { await GitConfig.find() }
let settings = await git?.settings()
var known = state?.known
@@ -40,7 +48,7 @@ final class GitLibrary {
}
func isOn(_ setting: GitSetting) -> Bool {
- state?.settings.map(setting.isOn(in:)) ?? false
+ asked[setting] ?? state?.settings.map(setting.isOn(in:)) ?? false
}
func isOffered(_ setting: GitSetting) -> Bool {
@@ -48,33 +56,60 @@ final class GitLibrary {
return setting != .signCommits || state.signingKey != nil || isOn(setting)
}
- func set(_ setting: GitSetting, to isOn: Bool) async {
- guard let git, !isWorking else { return }
- isWorking = true
- var ledger = ledger
- let outcome = isOn
- ? await ledger.turnOn(setting, signingKey: state?.signingKey, in: git)
- : await ledger.turnOff(setting, in: git)
- finish(ledger, refused: outcome == .refused)
- await refresh()
+ func set(_ setting: GitSetting, to isOn: Bool) {
+ ask([setting], isOn: isOn)
+ afterTheOthers {
+ await self.change([setting], to: isOn)
+ }
+ }
+
+ func turnAllOff() {
+ let settings = GitSetting.allCases.filter(isOn)
+ ask(settings, isOn: false)
+ afterTheOthers {
+ await self.change(settings, to: false)
+ }
}
- func turnAllOff() async {
- guard let git, !isWorking else { return }
- isWorking = true
- var ledger = ledger
- var refused = false
- for setting in GitSetting.allCases where isOn(setting) {
- refused = await ledger.turnOff(setting, in: git) == .refused || refused
+ private func ask(_ settings: [GitSetting], isOn: Bool) {
+ for setting in settings {
+ asked[setting] = isOn
+ waiting[setting, default: 0] += 1
}
- finish(ledger, refused: refused)
- await refresh()
}
- private func finish(_ ledger: GitLedger, refused: Bool) {
- self.ledger = ledger
- UserDefaults.standard.set(ledger.stored, forKey: Self.ledgerKey)
- wasRefused = refused
- isWorking = false
+ @discardableResult
+ private func afterTheOthers(_ work: @escaping @MainActor () async -> Void) -> Task<Void, Never> {
+ let others = changes
+ let task = Task {
+ await others?.value
+ await work()
+ }
+ changes = task
+ return task
+ }
+
+ 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
+ }
+ self.ledger = ledger
+ UserDefaults.standard.set(ledger.stored, forKey: Self.ledgerKey)
+ wasRefused = refused
+ await read()
+ }
+ for setting in settings {
+ waiting[setting, default: 1] -= 1
+ if waiting[setting] == 0 {
+ waiting[setting] = nil
+ asked[setting] = nil
+ }
+ }
}
}
diff --git a/Peel/Views/Terminal/GitTab.swift b/Peel/Views/Terminal/GitTab.swift
index 5d9b730b..b3b261f7 100644
--- a/Peel/Views/Terminal/GitTab.swift
+++ b/Peel/Views/Terminal/GitTab.swift
@@ -46,13 +46,13 @@ struct GitTab: View {
.safeAreaBar(edge: .bottom) {
TurnAllOffBar(
explanation: "Peel changes these with `git config --global`. Turning one off puts back what was there before Peel, or leaves it to Git.",
- isEnabled: git.hasSomethingOn && !git.isWorking
+ isEnabled: git.hasSomethingOn
) {
isConfirmingTurnAllOff = true
}
}
.alert("Turn off all Git settings?", isPresented: $isConfirmingTurnAllOff) {
- Button("Turn All Off") { Task { await git.turnAllOff() } }
+ Button("Turn All Off") { git.turnAllOff() }
Button("Cancel", role: .cancel) {}
} message: {
Text("Settings Peel changed go back to what they were, and the rest go back to Git’s defaults.")
@@ -74,9 +74,9 @@ private struct GitSettingRow: View {
caption: caption,
isOn: Binding(
get: { git.isOn(setting) },
- set: { isOn in Task { await git.set(setting, to: isOn) } }
+ set: { git.set(setting, to: $0) }
),
- isDisabled: !git.isOffered(setting) || git.isWorking
+ isDisabled: !git.isOffered(setting)
)
}