split Upgrade All into formulae & casks plus selective upgrades
"Upgrade All" becomes "Upgrade formulae & casks", and an "Upgrade only…" submenu offers Formulae/Casks with live counts — shown only when both kinds are outdated, since with a single kind the main item already upgrades exactly what there is. All three actions share one parametrized upgrade(formulae:casks:) flow; the confirmation dialog lists only the selected packages and drops the running-app warning when no casks are involved. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
parent
6a1c92a6fd
commit
c4baca221d
|
|
@ -18,6 +18,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
|||
var statusMenuItem: NSMenuItem!
|
||||
var outdatedItem: NSMenuItem!
|
||||
var upgradeAllItem: NSMenuItem!
|
||||
var upgradeOnlyItem: NSMenuItem!
|
||||
var upgradeFormulaeItem: NSMenuItem!
|
||||
var upgradeCasksItem: NSMenuItem!
|
||||
var outdatedSubmenu: NSMenu!
|
||||
var versionItem: NSMenuItem!
|
||||
|
||||
|
|
@ -74,9 +77,18 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
|||
menu.addItem(NSMenuItem.separator())
|
||||
|
||||
menu.addItem(NSMenuItem(title: "🔄 Refresh", action: #selector(refreshAction), keyEquivalent: "r"))
|
||||
upgradeAllItem = NSMenuItem(title: "📦 Upgrade All", action: #selector(upgradeAll), keyEquivalent: "u")
|
||||
upgradeAllItem = NSMenuItem(title: "📦 Upgrade formulae & casks", action: #selector(upgradeAll), keyEquivalent: "u")
|
||||
upgradeAllItem.isHidden = true // shown once a fetch finds outdated packages
|
||||
menu.addItem(upgradeAllItem)
|
||||
upgradeOnlyItem = NSMenuItem(title: "🎯 Upgrade only…", action: nil, keyEquivalent: "")
|
||||
let upgradeOnlySubmenu = NSMenu()
|
||||
upgradeFormulaeItem = NSMenuItem(title: "Formulae", action: #selector(upgradeFormulaeOnly), keyEquivalent: "")
|
||||
upgradeCasksItem = NSMenuItem(title: "Casks", action: #selector(upgradeCasksOnly), keyEquivalent: "")
|
||||
upgradeOnlySubmenu.addItem(upgradeFormulaeItem)
|
||||
upgradeOnlySubmenu.addItem(upgradeCasksItem)
|
||||
upgradeOnlyItem.submenu = upgradeOnlySubmenu
|
||||
upgradeOnlyItem.isHidden = true // shown only when both kinds are outdated
|
||||
menu.addItem(upgradeOnlyItem)
|
||||
outdatedItem = NSMenuItem(title: "📋 Outdated", action: nil, keyEquivalent: "")
|
||||
outdatedSubmenu = NSMenu()
|
||||
outdatedItem.submenu = outdatedSubmenu
|
||||
|
|
@ -306,8 +318,20 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
|||
}
|
||||
|
||||
@objc func upgradeAll() {
|
||||
upgrade(formulae: true, casks: true)
|
||||
}
|
||||
|
||||
@objc func upgradeFormulaeOnly() {
|
||||
upgrade(formulae: true, casks: false)
|
||||
}
|
||||
|
||||
@objc func upgradeCasksOnly() {
|
||||
upgrade(formulae: false, casks: true)
|
||||
}
|
||||
|
||||
func upgrade(formulae: Bool, casks: Bool) {
|
||||
if Settings.confirmBeforeUpgradeAll {
|
||||
guard confirmUpgrade() else { return }
|
||||
guard confirmUpgrade(formulae: formulae, casks: casks) else { return }
|
||||
}
|
||||
|
||||
statusMenuItem.title = "Upgrading..."
|
||||
|
|
@ -315,22 +339,22 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
|||
runBrew("update") { _, _ in
|
||||
// packages that turn outdated only after this brew update are not
|
||||
// in cachedOutdated yet; the final refetch will surface them
|
||||
let caskNames = self.cachedOutdated.casks.map(\.name)
|
||||
let caskNames = casks ? self.cachedOutdated.casks.map(\.name) : []
|
||||
let upgradeCasksThenRefresh = {
|
||||
self.upgradeCasksSequentially(caskNames) {
|
||||
self.cleanupAfterUpgradeIfEnabled {
|
||||
// everything was just upgraded; don't chain an auto-upgrade
|
||||
// a manual upgrade just ran; don't chain an auto-upgrade
|
||||
self.fetchOutdated(allowAutoUpgrade: false)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if self.cachedOutdated.formulae.isEmpty {
|
||||
upgradeCasksThenRefresh()
|
||||
} else {
|
||||
if formulae, !self.cachedOutdated.formulae.isEmpty {
|
||||
self.runBrew("upgrade --formula") { _, _ in
|
||||
upgradeCasksThenRefresh()
|
||||
}
|
||||
} else {
|
||||
upgradeCasksThenRefresh()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -350,21 +374,27 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
|||
}
|
||||
}
|
||||
|
||||
func confirmUpgrade() -> Bool {
|
||||
func confirmUpgrade(formulae: Bool, casks: Bool) -> Bool {
|
||||
let packages = (formulae ? cachedOutdated.formulae : []) + (casks ? cachedOutdated.casks : [])
|
||||
|
||||
let alert = NSAlert()
|
||||
alert.alertStyle = .warning
|
||||
|
||||
if cachedOutdated.isEmpty {
|
||||
if packages.isEmpty {
|
||||
alert.messageText = "Upgrade all outdated packages?"
|
||||
} else {
|
||||
alert.messageText = "Upgrade \(cachedOutdated.count) package\(cachedOutdated.count == 1 ? "" : "s")?"
|
||||
alert.messageText = "Upgrade \(packages.count) package\(packages.count == 1 ? "" : "s")?"
|
||||
}
|
||||
|
||||
var info = "Apps upgraded as casks (like a web browser) may be closed and replaced while running, without further warning. Save your work first."
|
||||
if !cachedOutdated.isEmpty {
|
||||
info += "\n\n" + cachedOutdated.all.map(\.label).joined(separator: "\n")
|
||||
// the running-app warning only applies when casks are being upgraded
|
||||
var lines: [String] = []
|
||||
if casks {
|
||||
lines.append("Apps upgraded as casks (like a web browser) may be closed and replaced while running, without further warning. Save your work first.")
|
||||
}
|
||||
alert.informativeText = info
|
||||
if !packages.isEmpty {
|
||||
lines.append(packages.map(\.label).joined(separator: "\n"))
|
||||
}
|
||||
alert.informativeText = lines.joined(separator: "\n\n")
|
||||
|
||||
alert.addButton(withTitle: "Upgrade")
|
||||
alert.addButton(withTitle: "Cancel")
|
||||
|
|
@ -464,6 +494,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
|||
outdatedSubmenu.removeAllItems()
|
||||
outdatedItem.isHidden = outdated.isEmpty
|
||||
upgradeAllItem.isHidden = outdated.isEmpty
|
||||
// "only" is meaningful only when both kinds are outdated; with a
|
||||
// single kind, the main item already upgrades exactly what there is
|
||||
upgradeOnlyItem.isHidden = outdated.formulae.isEmpty || outdated.casks.isEmpty
|
||||
upgradeFormulaeItem.title = "Formulae (\(outdated.formulae.count))"
|
||||
upgradeCasksItem.title = "Casks (\(outdated.casks.count))"
|
||||
|
||||
for package in outdated.all {
|
||||
let item = NSMenuItem(title: package.label, action: #selector(upgradeSingle(_:)), keyEquivalent: "")
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ class SettingsWindowController: NSWindowController {
|
|||
)
|
||||
|
||||
confirmCheckbox = NSButton(
|
||||
checkboxWithTitle: "Ask for confirmation before Upgrade All",
|
||||
checkboxWithTitle: "Ask for confirmation before bulk upgrades",
|
||||
target: self,
|
||||
action: #selector(toggleConfirm(_:))
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in a new issue