Compare commits
9 commits
4ab3cc1e70
...
9f848be875
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9f848be875 | ||
|
|
15034951fc | ||
|
|
9ab8af79a4 | ||
|
|
e41d7ac008 | ||
|
|
99c243a51c | ||
|
|
d1f4c0cb79 | ||
|
|
e47455b3f8 | ||
|
|
e579ac1d56 | ||
|
|
7390d68a33 |
|
|
@ -14,6 +14,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
||||||
|
|
||||||
var statusItem: NSStatusItem!
|
var statusItem: NSStatusItem!
|
||||||
var statusMenuItem: NSMenuItem!
|
var statusMenuItem: NSMenuItem!
|
||||||
|
var outdatedItem: NSMenuItem!
|
||||||
|
var upgradeAllItem: NSMenuItem!
|
||||||
var outdatedSubmenu: NSMenu!
|
var outdatedSubmenu: NSMenu!
|
||||||
var versionItem: NSMenuItem!
|
var versionItem: NSMenuItem!
|
||||||
|
|
||||||
|
|
@ -35,9 +37,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ✅ cache to prevent duplicate outdated calls
|
/// last known outdated list, shown in the Upgrade All confirmation
|
||||||
var cachedOutdated: [String] = []
|
var cachedOutdated: [String] = []
|
||||||
var lastOutdatedFetch: Date?
|
|
||||||
|
|
||||||
// MARK: - Menu
|
// MARK: - Menu
|
||||||
|
|
||||||
|
|
@ -53,11 +54,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
||||||
menu.addItem(NSMenuItem.separator())
|
menu.addItem(NSMenuItem.separator())
|
||||||
|
|
||||||
menu.addItem(NSMenuItem(title: "🔄 Refresh", action: #selector(refreshAction), keyEquivalent: "r"))
|
menu.addItem(NSMenuItem(title: "🔄 Refresh", action: #selector(refreshAction), keyEquivalent: "r"))
|
||||||
menu.addItem(NSMenuItem(title: "📦 Upgrade All", action: #selector(upgradeAll), keyEquivalent: "u"))
|
upgradeAllItem = NSMenuItem(title: "📦 Upgrade All", action: #selector(upgradeAll), keyEquivalent: "u")
|
||||||
let outdatedItem = NSMenuItem(title: "📋 Outdated", action: nil, keyEquivalent: "")
|
upgradeAllItem.isHidden = true // shown once a fetch finds outdated packages
|
||||||
|
menu.addItem(upgradeAllItem)
|
||||||
|
outdatedItem = NSMenuItem(title: "📋 Outdated", action: nil, keyEquivalent: "")
|
||||||
outdatedSubmenu = NSMenu()
|
outdatedSubmenu = NSMenu()
|
||||||
outdatedSubmenu.addItem(NSMenuItem(title: "Refresh List", action: #selector(forceRefreshOutdated), keyEquivalent: ""))
|
|
||||||
outdatedItem.submenu = outdatedSubmenu
|
outdatedItem.submenu = outdatedSubmenu
|
||||||
|
outdatedItem.isHidden = true // shown once a fetch finds outdated packages
|
||||||
menu.addItem(outdatedItem)
|
menu.addItem(outdatedItem)
|
||||||
menu.addItem(NSMenuItem(title: "📜 Logs", action: #selector(showLogs), keyEquivalent: "l"))
|
menu.addItem(NSMenuItem(title: "📜 Logs", action: #selector(showLogs), keyEquivalent: "l"))
|
||||||
|
|
||||||
|
|
@ -174,17 +177,40 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
||||||
return "brew"
|
return "brew"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Written once per launch; sudo runs it to show a GUI password dialog
|
||||||
|
/// whenever brew needs admin rights (no terminal is attached to Process).
|
||||||
|
static let askpassURL: URL = {
|
||||||
|
let dir = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask)[0]
|
||||||
|
.appendingPathComponent("BrewBar", isDirectory: true)
|
||||||
|
try? FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true)
|
||||||
|
|
||||||
|
let url = dir.appendingPathComponent("askpass.sh")
|
||||||
|
let script = """
|
||||||
|
#!/bin/zsh
|
||||||
|
osascript -e 'display dialog "BrewBar needs your administrator password to continue:" default answer "" with hidden answer with title "BrewBar" with icon caution buttons {"Cancel", "OK"} default button "OK"' -e 'text returned of result'
|
||||||
|
"""
|
||||||
|
try? script.write(to: url, atomically: true, encoding: .utf8)
|
||||||
|
try? FileManager.default.setAttributes([.posixPermissions: 0o700], ofItemAtPath: url.path)
|
||||||
|
return url
|
||||||
|
}()
|
||||||
|
|
||||||
func runBrew(_ command: String, completion: @escaping (String) -> Void = { _ in }) {
|
func runBrew(_ command: String, completion: @escaping (String) -> Void = { _ in }) {
|
||||||
DispatchQueue.global().async {
|
DispatchQueue.global().async {
|
||||||
let brew = self.resolveBrewPath()
|
let brew = self.resolveBrewPath()
|
||||||
let cleaned = command.replacingOccurrences(of: "brew ", with: "")
|
let cleaned = command.replacingOccurrences(of: "brew ", with: "")
|
||||||
let fullCommand = "\(brew) \(cleaned)"
|
let arguments = [brew] + cleaned.split(separator: " ").map(String.init)
|
||||||
|
|
||||||
self.log("→ \(fullCommand)\n")
|
self.log("→ \(arguments.joined(separator: " "))\n")
|
||||||
|
|
||||||
|
// env resolves brew via PATH (covers the bare "brew" fallback) and
|
||||||
|
// execs it directly — no shell, so no metacharacter interpretation
|
||||||
let process = Process()
|
let process = Process()
|
||||||
process.executableURL = URL(fileURLWithPath: "/bin/zsh")
|
process.executableURL = URL(fileURLWithPath: "/usr/bin/env")
|
||||||
process.arguments = ["-c", fullCommand]
|
process.arguments = arguments
|
||||||
|
|
||||||
|
var environment = ProcessInfo.processInfo.environment
|
||||||
|
environment["SUDO_ASKPASS"] = Self.askpassURL.path
|
||||||
|
process.environment = environment
|
||||||
|
|
||||||
let pipe = Pipe()
|
let pipe = Pipe()
|
||||||
process.standardOutput = pipe
|
process.standardOutput = pipe
|
||||||
|
|
@ -194,7 +220,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
||||||
try process.run()
|
try process.run()
|
||||||
} catch {
|
} catch {
|
||||||
self.log("ERROR: \(error)\n")
|
self.log("ERROR: \(error)\n")
|
||||||
completion("")
|
DispatchQueue.main.async { completion("") }
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -204,7 +230,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
||||||
let output = String(data: data, encoding: .utf8) ?? ""
|
let output = String(data: data, encoding: .utf8) ?? ""
|
||||||
|
|
||||||
self.log(output)
|
self.log(output)
|
||||||
completion(output)
|
// completion always on main: callers update AppKit UI, which is main-thread only
|
||||||
|
DispatchQueue.main.async { completion(output) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -215,6 +242,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
||||||
}
|
}
|
||||||
|
|
||||||
@objc func upgradeAll() {
|
@objc func upgradeAll() {
|
||||||
|
guard confirmUpgrade() else { return }
|
||||||
|
|
||||||
statusMenuItem.title = "Upgrading..."
|
statusMenuItem.title = "Upgrading..."
|
||||||
|
|
||||||
runBrew("update") { _ in
|
runBrew("update") { _ in
|
||||||
|
|
@ -224,20 +253,28 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// ✅ SMART refresh (uses cache)
|
func confirmUpgrade() -> Bool {
|
||||||
@objc func refreshOutdatedList() {
|
let alert = NSAlert()
|
||||||
// if fetched in last 5s → uses cache
|
alert.alertStyle = .warning
|
||||||
if let last = lastOutdatedFetch, Date().timeIntervalSince(last) < 5 {
|
|
||||||
updateOutdatedMenu(with: cachedOutdated)
|
if cachedOutdated.isEmpty {
|
||||||
return
|
alert.messageText = "Upgrade all outdated packages?"
|
||||||
|
} else {
|
||||||
|
alert.messageText = "Upgrade \(cachedOutdated.count) package\(cachedOutdated.count == 1 ? "" : "s")?"
|
||||||
}
|
}
|
||||||
|
|
||||||
fetchOutdated()
|
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.joined(separator: "\n")
|
||||||
|
}
|
||||||
|
alert.informativeText = info
|
||||||
|
|
||||||
/// ✅ FORCE refresh (menu button)
|
alert.addButton(withTitle: "Upgrade")
|
||||||
@objc func forceRefreshOutdated() {
|
alert.addButton(withTitle: "Cancel")
|
||||||
fetchOutdated()
|
|
||||||
|
// accessory app: bring the alert to the front, otherwise it can appear behind other windows
|
||||||
|
NSApp.activate(ignoringOtherApps: true)
|
||||||
|
return alert.runModal() == .alertFirstButtonReturn
|
||||||
}
|
}
|
||||||
|
|
||||||
func fetchOutdated() {
|
func fetchOutdated() {
|
||||||
|
|
@ -247,28 +284,21 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
||||||
let lines = BrewParser.parseOutdated(output)
|
let lines = BrewParser.parseOutdated(output)
|
||||||
|
|
||||||
self.cachedOutdated = lines
|
self.cachedOutdated = lines
|
||||||
self.lastOutdatedFetch = Date()
|
|
||||||
|
|
||||||
DispatchQueue.main.async {
|
self.updateOutdatedMenu(with: lines)
|
||||||
self.updateOutdatedMenu(with: lines)
|
self.updateStatus(count: lines.count)
|
||||||
self.updateStatus(count: lines.count)
|
if lines.isEmpty {
|
||||||
if lines.isEmpty {
|
self.setMenuBarIcon("brewbar-uptodate")
|
||||||
self.setMenuBarIcon("brewbar-uptodate")
|
} else {
|
||||||
} else {
|
self.setMenuBarIcon("brewbar-outdated")
|
||||||
self.setMenuBarIcon("brewbar-outdated")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func updateOutdatedMenu(with lines: [String]) {
|
func updateOutdatedMenu(with lines: [String]) {
|
||||||
outdatedSubmenu.removeAllItems()
|
outdatedSubmenu.removeAllItems()
|
||||||
outdatedSubmenu.addItem(NSMenuItem(title: "Refresh List", action: #selector(forceRefreshOutdated), keyEquivalent: ""))
|
outdatedItem.isHidden = lines.isEmpty
|
||||||
|
upgradeAllItem.isHidden = lines.isEmpty
|
||||||
if lines.isEmpty {
|
|
||||||
outdatedSubmenu.addItem(NSMenuItem(title: "✅ All up to date", action: nil, keyEquivalent: ""))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
for formula in lines {
|
for formula in lines {
|
||||||
let item = NSMenuItem(title: formula, action: #selector(upgradeSingle(_:)), keyEquivalent: "")
|
let item = NSMenuItem(title: formula, action: #selector(upgradeSingle(_:)), keyEquivalent: "")
|
||||||
|
|
@ -305,18 +335,22 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
||||||
func refreshBrewVersion() {
|
func refreshBrewVersion() {
|
||||||
runBrew("--version") { output in
|
runBrew("--version") { output in
|
||||||
let firstLine = BrewParser.parseVersion(output)
|
let firstLine = BrewParser.parseVersion(output)
|
||||||
|
self.versionItem.title = "🏷 \(firstLine)"
|
||||||
DispatchQueue.main.async {
|
|
||||||
self.versionItem.title = "🏷 \(firstLine)"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: - Logs
|
// MARK: - Logs
|
||||||
|
|
||||||
|
/// oldest content is dropped past this size, or the buffer grows forever
|
||||||
|
/// and every log() re-renders an ever-larger string into the text view
|
||||||
|
let maxLogLength = 100_000
|
||||||
|
|
||||||
func log(_ text: String) {
|
func log(_ text: String) {
|
||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
self.logBuffer += text
|
self.logBuffer += text
|
||||||
|
if self.logBuffer.count > self.maxLogLength {
|
||||||
|
self.logBuffer = String(self.logBuffer.suffix(self.maxLogLength))
|
||||||
|
}
|
||||||
self.logWindow?.update(text: self.logBuffer)
|
self.logWindow?.update(text: self.logBuffer)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue