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.

Hold a quit for Homebrew, and ask before stopping an upgrade

Țugui Dragoș206176fc9e6d
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstrings
index 635cb571..b717f265 100644
--- a/Localization/Peel/Localizable.xcstrings
+++ b/Localization/Peel/Localizable.xcstrings
@@ -53782,6 +53782,112 @@
}
}
},
+ "Homebrew is still upgrading." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew stále upgraduje."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew führt noch ein Upgrade aus."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew aún está actualizando paquetes."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew effectue encore une mise à niveau."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew sta ancora eseguendo l’aggiornamento."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrewはまだアップグレード中です。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew가 아직 업그레이드 중입니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew is nog aan het upgraden."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew jeszcze nie zakończył uaktualniania."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "O Homebrew ainda está fazendo upgrade."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew încă face upgrade."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew еще выполняет обновление."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew uppgraderar fortfarande."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew hâlâ yükseltme yapıyor."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew ще оновлює пакети."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew仍在升级。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew仍在升級。"
+ }
+ }
+ }
+ },
"Homebrew isn’t installed." : {
"localizations" : {
"cs" : {
@@ -57944,6 +58050,112 @@
}
}
},
+ "If you quit now, Homebrew stops, and a package it is in the middle of installing may be left half installed. A cask’s app can stay in Homebrew’s folder until you reinstall the cask." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Pokud teď Peel ukončíte, Homebrew se zastaví a balíček, který právě instaluje, může zůstat napůl nainstalovaný. Aplikace, kterou instaluje cask, může zůstat ve složce Homebrew, dokud cask znovu nenainstalujete."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Wenn du Peel jetzt beendest, stoppt Homebrew, und ein Paket, das Homebrew gerade installiert, bleibt möglicherweise nur teilweise installiert. Die App eines Casks kann im Ordner von Homebrew bleiben, bis du den Cask erneut installierst."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Si sales ahora, Homebrew se detiene, y un paquete que esté instalando en este momento puede quedar a medio instalar. La app de un cask puede quedarse en la carpeta de Homebrew hasta que vuelvas a instalar el cask."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Si vous quittez maintenant, Homebrew s’arrête, et un paquet qu’il est en train d’installer pourrait rester partiellement installé. L’app d’un cask peut rester dans le dossier de Homebrew jusqu’à ce que vous réinstalliez le cask."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Se esci ora, Homebrew si interrompe e un pacchetto che sta installando potrebbe restare installato a metà. L’app di un cask può restare nella cartella di Homebrew finché non reinstalli il cask."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "今終了するとHomebrewが停止し、インストールしている途中のパッケージが不完全にインストールされたままになる場合があります。caskのアプリは、caskを再インストールするまでHomebrewのフォルダに残ることがあります。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "지금 종료하면 Homebrew가 중단되며, Homebrew가 설치 중인 패키지는 일부만 설치된 상태로 남을 수 있습니다. cask의 앱은 cask를 다시 설치할 때까지 Homebrew의 폴더에 남아 있을 수 있습니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Als je Peel nu stopt, stopt Homebrew ook, en een pakket dat Homebrew nog aan het installeren is, kan half geïnstalleerd achterblijven. De app van een cask kan in de map van Homebrew blijven staan totdat je de cask opnieuw installeert."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Jeśli teraz zakończysz Peel, Homebrew się zatrzyma, a pakiet, który właśnie instaluje, może zostać zainstalowany częściowo. Aplikacja danego cask może pozostać w folderze Homebrew, dopóki ponownie nie zainstalujesz tego cask."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Se você encerrar o Peel agora, o Homebrew é interrompido, e um pacote que ele estiver instalando no momento pode ficar instalado pela metade. O app de um cask pode ficar na pasta do Homebrew até você reinstalar o cask."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Dacă închideți Peel acum, Homebrew se oprește, iar un pachet pe care încă îl instalează poate rămâne instalat pe jumătate. Aplicația unui cask poate rămâne în dosarul Homebrew până când reinstalați cask‑ul."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Если завершить Peel сейчас, Homebrew остановится, и пакет, который он устанавливает в этот момент, может остаться установленным наполовину. Приложение из cask может остаться в папке Homebrew, пока Вы не переустановите этот cask."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Om du avslutar nu stoppas Homebrew, och ett paket som Homebrew håller på att installera kan bli halvt installerat. En casks app kan ligga kvar i Homebrews mapp tills du installerar om casken."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Şimdi çıkarsanız Homebrew durur ve yüklemekte olduğu bir paket yarım yüklenmiş hâlde kalabilir. Bir cask paketinin uygulaması, siz o cask paketini yeniden yükleyene kadar Homebrew’un klasöründe kalabilir."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Якщо зараз завершити роботу, Homebrew зупиниться, і пакет, який він саме інсталює, може залишитися інстальованим лише частково. Програма, яку інсталює cask, може лишитися в папці Homebrew, доки ви не перевстановите цей cask."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "如果现在退出,Homebrew会停止,它正在安装的软件包可能只安装了部分。cask的App可能会留在Homebrew的文件夹中,直到你重新安装该cask。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "如果你現在結束,Homebrew會停止,而它正在安裝的套件可能只有一部分完成安裝。cask的App可能會留在Homebrew的檔案夾中,直到你重新安裝該cask。"
+ }
+ }
+ }
+ },
"Image Units" : {
"localizations" : {
"cs" : {
@@ -68685,6 +68897,112 @@
}
}
},
+ "Keep Peel Open" : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ponechat Peel otevřený"
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel geöffnet lassen"
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Mantener Peel abierto"
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Laisser Peel ouvert"
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Mantieni Peel aperto"
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peelを開いたままにする"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel 열어 두기"
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Houd Peel open"
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Pozostaw Peel otwarty"
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Manter o Peel Aberto"
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Lăsați Peel deschis"
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Оставить Peel открытым"
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Låt Peel vara öppen"
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel’i Açık Tut"
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Залишити Peel відкритою"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "保持Peel打开"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "讓Peel保持打開"
+ }
+ }
+ }
+ },
"Keep connections alive" : {
"localizations" : {
"cs" : {
@@ -158363,6 +158681,112 @@
}
}
},
+ "Stop and Quit" : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Zastavit a ukončit"
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Stoppen und beenden"
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Detener y salir"
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Arrêter et quitter"
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Interrompi ed esci"
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "停止して終了"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "중단 및 종료"
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Stop Homebrew en Peel"
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Zatrzymaj i zakończ"
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Parar e Encerrar"
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Opriți și închideți"
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Остановить и завершить"
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Stoppa och avsluta"
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Durdur ve Çık"
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Зупинити й завершити"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "停止并退出"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "停止並結束"
+ }
+ }
+ }
+ },
"Stop removing downloads" : {
"localizations" : {
"cs" : {
diff --git a/Peel/Model/HomebrewLibrary.swift b/Peel/Model/HomebrewLibrary.swift
index 28d99187..4b44ca1b 100644
--- a/Peel/Model/HomebrewLibrary.swift
+++ b/Peel/Model/HomebrewLibrary.swift
@@ -292,7 +292,17 @@ final class HomebrewLibrary {
}
let task = Task { await outcome(of: command) }
runningTask = task
- let outcome = await task.value
+ // A quit waits for what changes something, and asks before it stops an upgrade, which can take long.
+ var stop: (@MainActor () -> Void)?
+ if command.isUpgrade {
+ stop = { [weak self] in self?.stopUpgrade() }
+ }
+ let outcome: CommandResult?
+ if command.onlyLooks {
+ outcome = await task.value
+ } else {
+ outcome = await QuitGuard.shared.run(stoppingWith: stop) { await task.value }
+ }
if showsResult, let outcome { result = outcome }
if !command.onlyLooks { await refresh(includingReclaimable: true) }
return outcome
diff --git a/Peel/Model/QuitGuard.swift b/Peel/Model/QuitGuard.swift
index b1126107..97e9d7d7 100644
--- a/Peel/Model/QuitGuard.swift
+++ b/Peel/Model/QuitGuard.swift
@@ -1,9 +1,10 @@
import AppKit
-/// What a quit waits for: a removal from its first move until History has it, and a Put Back until it is done.
-/// Quitting halfway would leave what already moved in History as an interrupted removal, without its name or sizes,
-/// skip what follows a move (stopping a job whose file went, forgetting its settings), and leave items put back
-/// listed as still in the Trash.
+/// What a quit waits for: a removal from its first move until History has it, a Put Back until it is done, and a
+/// Homebrew command that changes something. Quitting halfway would leave what already moved in History as an
+/// interrupted removal, without its name or sizes, skip what follows a move (stopping a job whose file went,
+/// forgetting its settings), leave items put back listed as still in the Trash, and leave Homebrew with nowhere to
+/// write, so it stops at its next line.
@MainActor
final class QuitGuard {
static let shared = QuitGuard()
@@ -11,15 +12,36 @@ final class QuitGuard {
private var running = 0
private var refusing = 0
private var isQuitWaiting = false
+ /// What stops each piece of work under way that can be stopped, by its own number.
+ private var stops: [Int: @MainActor () -> Void] = [:]
+ private var nextNumber = 0
+ private let asksToStop: @MainActor () -> Bool
+ private let answer: @MainActor (Bool) -> Void
- /// Runs `work`, and a quit asked meanwhile waits for it to end.
- func run<T, Failure: Error>(_ work: () async throws(Failure) -> T) async throws(Failure) -> T {
+ init(
+ asksToStop: @escaping @MainActor () -> Bool = QuitGuard.askToStop,
+ answer: @escaping @MainActor (Bool) -> Void = { NSApp.reply(toApplicationShouldTerminate: $0) }
+ ) {
+ self.asksToStop = asksToStop
+ self.answer = answer
+ }
+
+ /// Runs `work`, and a quit asked meanwhile waits for it to end. Work that can take long, such as a Homebrew
+ /// upgrade, passes `stop`, which a quit calls once the person agrees to stop it.
+ func run<T, Failure: Error>(
+ stoppingWith stop: (@MainActor () -> Void)? = nil,
+ _ work: () async throws(Failure) -> T
+ ) async throws(Failure) -> T {
running += 1
+ let number = nextNumber
+ nextNumber += 1
+ stops[number] = stop
defer {
+ stops[number] = nil
running -= 1
if running == 0, isQuitWaiting {
isQuitWaiting = false
- NSApp.reply(toApplicationShouldTerminate: true)
+ answer(true)
}
}
return try await work()
@@ -33,14 +55,28 @@ final class QuitGuard {
return await work()
}
- /// The answer to a quit: now when nothing is under way, otherwise once the last of it ends.
+ /// The answer to a quit: now when nothing is under way, otherwise once the last of it ends. Work that can be
+ /// stopped is stopped only on the person's word, and a quit they decline is cancelled.
func replyToQuit() -> NSApplication.TerminateReply {
guard refusing == 0 else { return .terminateCancel }
guard running > 0 else { return .terminateNow }
+ if !stops.isEmpty {
+ guard asksToStop() else { return .terminateCancel }
+ stops.values.forEach { $0() }
+ }
isQuitWaiting = true
return .terminateLater
}
+ static func askToStop() -> Bool {
+ let alert = NSAlert()
+ alert.messageText = String(localized: "Homebrew is still upgrading.")
+ alert.informativeText = String(localized: "If you quit now, Homebrew stops, and a package it is in the middle of installing may be left half installed. A cask’s app can stay in Homebrew’s folder until you reinstall the cask.")
+ alert.addButton(withTitle: String(localized: "Keep Peel Open"))
+ alert.addButton(withTitle: String(localized: "Stop and Quit")).hasDestructiveAction = true
+ return alert.runModal() == .alertSecondButtonReturn
+ }
+
/// Asks Peel to quit from the run loop rather than from inside the task that asks. The loop AppKit runs while a
/// quit waits takes the main queue's next block only once the running one returns, so a quit asked from inside
/// one would hold back the very work it waits for.
diff --git a/PeelTests/QuitGuardTests.swift b/PeelTests/QuitGuardTests.swift
index 703da98e..25195a8e 100644
--- a/PeelTests/QuitGuardTests.swift
+++ b/PeelTests/QuitGuardTests.swift
@@ -27,4 +27,26 @@ struct QuitGuardTests {
#expect(reply == .terminateCancel)
}
+
+ @Test func aQuitDuringStoppableWorkStopsItOnlyOnThePersonsWord() async {
+ final class Record {
+ var asked = 0
+ var stopped = 0
+ var answers: [Bool] = []
+ }
+ let record = Record()
+ var reply: NSApplication.TerminateReply?
+
+ let keepingOpen = QuitGuard(
+ asksToStop: { record.asked += 1; return false }, answer: { record.answers.append($0) }
+ )
+ await keepingOpen.run(stoppingWith: { record.stopped += 1 }) { reply = keepingOpen.replyToQuit() }
+ #expect(reply == .terminateCancel)
+ #expect(record.asked == 1 && record.stopped == 0 && record.answers.isEmpty)
+
+ let stopping = QuitGuard(asksToStop: { true }, answer: { record.answers.append($0) })
+ await stopping.run(stoppingWith: { record.stopped += 1 }) { reply = stopping.replyToQuit() }
+ #expect(reply == .terminateLater)
+ #expect(record.stopped == 1 && record.answers == [true])
+ }
}