Adding Xcode project; base code available and working
This commit is contained in:
parent
8a70403d59
commit
b7fb754e09
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
*.xcuserdatad/
|
||||||
|
|
@ -10,9 +10,22 @@
|
||||||
87F2AA622FEE797F0014F9D6 /* BrewBar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BrewBar.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
87F2AA622FEE797F0014F9D6 /* BrewBar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BrewBar.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||||
/* End PBXFileReference section */
|
/* End PBXFileReference section */
|
||||||
|
|
||||||
|
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
|
||||||
|
87F2AA712FEE7A680014F9D6 /* Exceptions for "BrewBar" folder in "BrewBar" target */ = {
|
||||||
|
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
|
||||||
|
membershipExceptions = (
|
||||||
|
Info.plist,
|
||||||
|
);
|
||||||
|
target = 87F2AA612FEE797F0014F9D6 /* BrewBar */;
|
||||||
|
};
|
||||||
|
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
|
||||||
|
|
||||||
/* Begin PBXFileSystemSynchronizedRootGroup section */
|
/* Begin PBXFileSystemSynchronizedRootGroup section */
|
||||||
87F2AA642FEE797F0014F9D6 /* BrewBar */ = {
|
87F2AA642FEE797F0014F9D6 /* BrewBar */ = {
|
||||||
isa = PBXFileSystemSynchronizedRootGroup;
|
isa = PBXFileSystemSynchronizedRootGroup;
|
||||||
|
exceptions = (
|
||||||
|
87F2AA712FEE7A680014F9D6 /* Exceptions for "BrewBar" folder in "BrewBar" target */,
|
||||||
|
);
|
||||||
path = BrewBar;
|
path = BrewBar;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
|
|
@ -251,17 +264,20 @@
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
COMBINE_HIDPI_IMAGES = YES;
|
COMBINE_HIDPI_IMAGES = YES;
|
||||||
CURRENT_PROJECT_VERSION = 1;
|
CURRENT_PROJECT_VERSION = 1;
|
||||||
ENABLE_APP_SANDBOX = YES;
|
ENABLE_APP_SANDBOX = NO;
|
||||||
ENABLE_PREVIEWS = YES;
|
ENABLE_PREVIEWS = YES;
|
||||||
ENABLE_USER_SELECTED_FILES = readonly;
|
|
||||||
GENERATE_INFOPLIST_FILE = YES;
|
GENERATE_INFOPLIST_FILE = YES;
|
||||||
|
INFOPLIST_FILE = BrewBar/Info.plist;
|
||||||
|
INFOPLIST_KEY_CFBundleDisplayName = BrewBar;
|
||||||
|
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
|
||||||
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
||||||
|
INFOPLIST_KEY_NSPrincipalClass = BrewBar.AppDelegate;
|
||||||
LD_RUNPATH_SEARCH_PATHS = (
|
LD_RUNPATH_SEARCH_PATHS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/../Frameworks",
|
"@executable_path/../Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0;
|
MARKETING_VERSION = 1.0;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = MaxSoch.BrewBar;
|
PRODUCT_BUNDLE_IDENTIFIER = com.MaxSoch.BrewBar;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
REGISTER_APP_GROUPS = YES;
|
REGISTER_APP_GROUPS = YES;
|
||||||
STRING_CATALOG_GENERATE_SYMBOLS = YES;
|
STRING_CATALOG_GENERATE_SYMBOLS = YES;
|
||||||
|
|
@ -281,17 +297,20 @@
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
COMBINE_HIDPI_IMAGES = YES;
|
COMBINE_HIDPI_IMAGES = YES;
|
||||||
CURRENT_PROJECT_VERSION = 1;
|
CURRENT_PROJECT_VERSION = 1;
|
||||||
ENABLE_APP_SANDBOX = YES;
|
ENABLE_APP_SANDBOX = NO;
|
||||||
ENABLE_PREVIEWS = YES;
|
ENABLE_PREVIEWS = YES;
|
||||||
ENABLE_USER_SELECTED_FILES = readonly;
|
|
||||||
GENERATE_INFOPLIST_FILE = YES;
|
GENERATE_INFOPLIST_FILE = YES;
|
||||||
|
INFOPLIST_FILE = BrewBar/Info.plist;
|
||||||
|
INFOPLIST_KEY_CFBundleDisplayName = BrewBar;
|
||||||
|
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
|
||||||
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
||||||
|
INFOPLIST_KEY_NSPrincipalClass = BrewBar.AppDelegate;
|
||||||
LD_RUNPATH_SEARCH_PATHS = (
|
LD_RUNPATH_SEARCH_PATHS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/../Frameworks",
|
"@executable_path/../Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0;
|
MARKETING_VERSION = 1.0;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = MaxSoch.BrewBar;
|
PRODUCT_BUNDLE_IDENTIFIER = com.MaxSoch.BrewBar;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
REGISTER_APP_GROUPS = YES;
|
REGISTER_APP_GROUPS = YES;
|
||||||
STRING_CATALOG_GENERATE_SYMBOLS = YES;
|
STRING_CATALOG_GENERATE_SYMBOLS = YES;
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,7 @@
|
||||||
"size" : "512x512"
|
"size" : "512x512"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "GPT_image-2026-06-30-16-40-01-removebg-preview.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "2x",
|
"scale" : "2x",
|
||||||
"size" : "512x512"
|
"size" : "512x512"
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 654 KiB |
21
BrewBar/Assets.xcassets/brewbar-outdated.imageset/Contents.json
vendored
Normal file
21
BrewBar/Assets.xcassets/brewbar-outdated.imageset/Contents.json
vendored
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"filename" : "outdated-removebg-preview.png",
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
BrewBar/Assets.xcassets/brewbar-outdated.imageset/outdated-removebg-preview.png
vendored
Normal file
BIN
BrewBar/Assets.xcassets/brewbar-outdated.imageset/outdated-removebg-preview.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 44 KiB |
21
BrewBar/Assets.xcassets/brewbar-updating.imageset/Contents.json
vendored
Normal file
21
BrewBar/Assets.xcassets/brewbar-updating.imageset/Contents.json
vendored
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"filename" : "updating-removebg-preview.png",
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
BrewBar/Assets.xcassets/brewbar-updating.imageset/updating-removebg-preview.png
vendored
Normal file
BIN
BrewBar/Assets.xcassets/brewbar-updating.imageset/updating-removebg-preview.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 52 KiB |
21
BrewBar/Assets.xcassets/brewbar-uptodate.imageset/Contents.json
vendored
Normal file
21
BrewBar/Assets.xcassets/brewbar-uptodate.imageset/Contents.json
vendored
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"filename" : "test_-removebg-preview.png",
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
BrewBar/Assets.xcassets/brewbar-uptodate.imageset/test_-removebg-preview.png
vendored
Normal file
BIN
BrewBar/Assets.xcassets/brewbar-uptodate.imageset/test_-removebg-preview.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 44 KiB |
|
|
@ -1,17 +1,343 @@
|
||||||
//
|
import Cocoa
|
||||||
// BrewBarApp.swift
|
|
||||||
// BrewBar
|
|
||||||
//
|
|
||||||
// Created by Maxence Socheleau on 26.06.2026.
|
|
||||||
//
|
|
||||||
|
|
||||||
import SwiftUI
|
|
||||||
|
|
||||||
@main
|
@main
|
||||||
struct BrewBarApp: App {
|
class AppDelegate: NSObject, NSApplicationDelegate {
|
||||||
var body: some Scene {
|
|
||||||
WindowGroup {
|
static func main() {
|
||||||
ContentView()
|
let app = NSApplication.shared
|
||||||
|
let delegate = AppDelegate()
|
||||||
|
app.delegate = delegate
|
||||||
|
app.setActivationPolicy(.accessory)
|
||||||
|
app.run()
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Varaibles
|
||||||
|
|
||||||
|
var statusItem: NSStatusItem!
|
||||||
|
var statusMenuItem: NSMenuItem!
|
||||||
|
var outdatedSubmenu: NSMenu!
|
||||||
|
var versionItem: NSMenuItem!
|
||||||
|
|
||||||
|
var logWindow: LogWindowController?
|
||||||
|
var logBuffer: String = ""
|
||||||
|
|
||||||
|
var brewPath: String?
|
||||||
|
|
||||||
|
var refreshTimer: Timer?
|
||||||
|
//var refreshInterval: TimeInterval = 3600
|
||||||
|
var refreshInterval: TimeInterval {
|
||||||
|
get {
|
||||||
|
let saved = UserDefaults.standard.double(forKey: "refreshInterval")
|
||||||
|
return saved > 0 ? saved : 3600 // fallback 1h si jamais défini
|
||||||
|
}
|
||||||
|
set {
|
||||||
|
UserDefaults.standard.set(newValue, forKey: "refreshInterval")
|
||||||
|
UserDefaults.standard.synchronize()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ✅ cache to prevent duplicate outdated calls
|
||||||
|
var cachedOutdated: [String] = []
|
||||||
|
var lastOutdatedFetch: Date?
|
||||||
|
|
||||||
|
// MARK: - Menu
|
||||||
|
|
||||||
|
func applicationDidFinishLaunching(_ notification: Notification) {
|
||||||
|
|
||||||
|
statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
|
||||||
|
setMenuBarIcon("brewbar-uptodate")
|
||||||
|
|
||||||
|
let menu = NSMenu()
|
||||||
|
|
||||||
|
statusMenuItem = NSMenuItem(title: "Checking...", action: nil, keyEquivalent: "")
|
||||||
|
menu.addItem(statusMenuItem)
|
||||||
|
|
||||||
|
menu.addItem(NSMenuItem.separator())
|
||||||
|
|
||||||
|
menu.addItem(NSMenuItem(title: "🔄 Refresh", action: #selector(refreshAction), keyEquivalent: "r"))
|
||||||
|
menu.addItem(NSMenuItem(title: "📦 Upgrade All", action: #selector(upgradeAll), keyEquivalent: "u"))
|
||||||
|
let outdatedItem = NSMenuItem(title: "📋 Outdated", action: nil, keyEquivalent: "")
|
||||||
|
outdatedSubmenu = NSMenu()
|
||||||
|
outdatedSubmenu.addItem(NSMenuItem(title: "Refresh List", action: #selector(forceRefreshOutdated), keyEquivalent: ""))
|
||||||
|
outdatedItem.submenu = outdatedSubmenu
|
||||||
|
menu.addItem(outdatedItem)
|
||||||
|
menu.addItem(NSMenuItem(title: "📜 Logs", action: #selector(showLogs), keyEquivalent: "l"))
|
||||||
|
|
||||||
|
menu.addItem(NSMenuItem.separator())
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
let intervalItem = NSMenuItem(title: "⏱ Refresh Interval", action: nil, keyEquivalent: "")
|
||||||
|
let intervalSubmenu = NSMenu()
|
||||||
|
|
||||||
|
let options: [(String, TimeInterval)] = [
|
||||||
|
("1 heure", 3600),
|
||||||
|
("6 heures", 21600),
|
||||||
|
]
|
||||||
|
|
||||||
|
for (label, interval) in options {
|
||||||
|
let item = NSMenuItem(title: label, action: #selector(setRefreshInterval(_:)), keyEquivalent: "")
|
||||||
|
item.representedObject = interval
|
||||||
|
intervalSubmenu.addItem(item)
|
||||||
|
}
|
||||||
|
|
||||||
|
let customMenuItem = NSMenuItem()
|
||||||
|
let customView = NSView(frame: NSRect(x: 0, y: 0, width: 200, height: 30))
|
||||||
|
|
||||||
|
let textField = NSTextField(frame: NSRect(x: 10, y: 4, width: 120, height: 22))
|
||||||
|
textField.placeholderString = "Secondes..."
|
||||||
|
textField.stringValue = "\(Int(refreshInterval))"
|
||||||
|
|
||||||
|
let confirmButton = NSButton(frame: NSRect(x: 138, y: 4, width: 52, height: 22))
|
||||||
|
confirmButton.title = "✓ Set"
|
||||||
|
confirmButton.bezelStyle = .rounded
|
||||||
|
confirmButton.target = self
|
||||||
|
confirmButton.action = #selector(applyCustomInterval(_:))
|
||||||
|
|
||||||
|
customView.addSubview(textField)
|
||||||
|
customView.addSubview(confirmButton)
|
||||||
|
customMenuItem.view = customView
|
||||||
|
intervalSubmenu.addItem(customMenuItem)
|
||||||
|
|
||||||
|
intervalItem.submenu = intervalSubmenu
|
||||||
|
menu.addItem(intervalItem)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
versionItem = NSMenuItem(title: "🏷 Brew: ...", action: nil, keyEquivalent: "")
|
||||||
|
menu.addItem(versionItem)
|
||||||
|
|
||||||
|
menu.addItem(NSMenuItem.separator())
|
||||||
|
|
||||||
|
menu.addItem(NSMenuItem(title: "Quit", action: #selector(NSApplication.terminate(_:)), keyEquivalent: "q"))
|
||||||
|
|
||||||
|
statusItem.menu = menu
|
||||||
|
|
||||||
|
refreshAll()
|
||||||
|
refreshBrewVersion()
|
||||||
|
|
||||||
|
refreshTimer = Timer.scheduledTimer(withTimeInterval: refreshInterval, repeats: true) { _ in
|
||||||
|
self.refreshAll()
|
||||||
|
} // pour arrêter : refreshTimer?.invalidate()
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Env func
|
||||||
|
|
||||||
|
func setMenuBarIcon(_ name: String) {
|
||||||
|
DispatchQueue.main.async {
|
||||||
|
if let button = self.statusItem.button {
|
||||||
|
if let icon = NSImage(named: name) {
|
||||||
|
icon.size = NSSize(width: 22, height: 22)
|
||||||
|
icon.isTemplate = true
|
||||||
|
button.image = icon
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func restartTimer() {
|
||||||
|
refreshTimer?.invalidate() // stop running timer
|
||||||
|
refreshTimer = Timer.scheduledTimer(withTimeInterval: refreshInterval, repeats: true) { _ in
|
||||||
|
self.refreshAll()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@objc func setRefreshInterval(_ sender: NSMenuItem) {
|
||||||
|
guard let interval = sender.representedObject as? TimeInterval else { return }
|
||||||
|
refreshInterval = interval // ← le set sauvegarde dans UserDefaults
|
||||||
|
restartTimer()
|
||||||
|
}
|
||||||
|
|
||||||
|
@objc func applyCustomInterval(_ sender: NSButton) {
|
||||||
|
guard let view = sender.superview,
|
||||||
|
let textField = view.subviews.first(where: { $0 is NSTextField }) as? NSTextField,
|
||||||
|
let seconds = Int(textField.stringValue), seconds > 0 else { return }
|
||||||
|
|
||||||
|
refreshInterval = TimeInterval(seconds)
|
||||||
|
restartTimer()
|
||||||
|
statusItem.menu?.cancelTracking()
|
||||||
|
}
|
||||||
|
|
||||||
|
func resolveBrewPath() -> String {
|
||||||
|
if let cached = brewPath {
|
||||||
|
return cached
|
||||||
|
}
|
||||||
|
|
||||||
|
let paths = [
|
||||||
|
"/opt/homebrew/bin/brew",
|
||||||
|
"/usr/local/bin/brew"
|
||||||
|
]
|
||||||
|
|
||||||
|
for path in paths {
|
||||||
|
if FileManager.default.isExecutableFile(atPath: path) {
|
||||||
|
brewPath = path
|
||||||
|
return path
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//fallback
|
||||||
|
brewPath = "brew"
|
||||||
|
return "brew"
|
||||||
|
}
|
||||||
|
|
||||||
|
func runBrew(_ command: String, completion: @escaping (String) -> Void = { _ in }) {
|
||||||
|
|
||||||
|
DispatchQueue.global().async {
|
||||||
|
|
||||||
|
let brew = self.resolveBrewPath()
|
||||||
|
let cleaned = command.replacingOccurrences(of: "brew ", with: "")
|
||||||
|
let fullCommand = "\(brew) \(cleaned)"
|
||||||
|
|
||||||
|
self.log("→ \(fullCommand)\n")
|
||||||
|
|
||||||
|
let process = Process()
|
||||||
|
process.executableURL = URL(fileURLWithPath: "/bin/zsh")
|
||||||
|
process.arguments = ["-c", fullCommand]
|
||||||
|
|
||||||
|
let pipe = Pipe()
|
||||||
|
process.standardOutput = pipe
|
||||||
|
process.standardError = pipe
|
||||||
|
|
||||||
|
do {
|
||||||
|
try process.run()
|
||||||
|
} catch {
|
||||||
|
self.log("ERROR: \(error)\n")
|
||||||
|
completion("")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
let data = pipe.fileHandleForReading.readDataToEndOfFile()
|
||||||
|
process.waitUntilExit()
|
||||||
|
|
||||||
|
let output = String(data: data, encoding: .utf8) ?? ""
|
||||||
|
|
||||||
|
self.log(output)
|
||||||
|
completion(output)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Actions
|
||||||
|
|
||||||
|
@objc func refreshAction() {
|
||||||
|
refreshAll()
|
||||||
|
}
|
||||||
|
|
||||||
|
@objc func upgradeAll() {
|
||||||
|
statusMenuItem.title = "Upgrading..."
|
||||||
|
|
||||||
|
runBrew("update") { _ in
|
||||||
|
self.runBrew("upgrade") { _ in
|
||||||
|
self.fetchOutdated()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ✅ SMART refresh (uses cache)
|
||||||
|
@objc func refreshOutdatedList() {
|
||||||
|
|
||||||
|
// if fetched in last 5s → uses cache
|
||||||
|
if let last = lastOutdatedFetch, Date().timeIntervalSince(last) < 5 {
|
||||||
|
updateOutdatedMenu(with: cachedOutdated)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
fetchOutdated()
|
||||||
|
}
|
||||||
|
|
||||||
|
// ✅ FORCE refresh (menu button)
|
||||||
|
@objc func forceRefreshOutdated() {
|
||||||
|
fetchOutdated()
|
||||||
|
}
|
||||||
|
|
||||||
|
func fetchOutdated() {
|
||||||
|
setMenuBarIcon("brewbar-updating")
|
||||||
|
|
||||||
|
runBrew("outdated") { output in
|
||||||
|
|
||||||
|
let lines = output.split(separator: "\n").map { String($0) }
|
||||||
|
|
||||||
|
self.cachedOutdated = lines
|
||||||
|
self.lastOutdatedFetch = Date()
|
||||||
|
|
||||||
|
DispatchQueue.main.async {
|
||||||
|
self.updateOutdatedMenu(with: lines)
|
||||||
|
self.updateStatus(count: lines.count)
|
||||||
|
if lines.isEmpty {
|
||||||
|
self.setMenuBarIcon("brewbar-uptodate")
|
||||||
|
} else {
|
||||||
|
self.setMenuBarIcon("brewbar-outdated")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func updateOutdatedMenu(with lines: [String]) {
|
||||||
|
|
||||||
|
outdatedSubmenu.removeAllItems()
|
||||||
|
outdatedSubmenu.addItem(NSMenuItem(title: "Refresh List", action: #selector(forceRefreshOutdated), keyEquivalent: ""))
|
||||||
|
|
||||||
|
if lines.isEmpty {
|
||||||
|
outdatedSubmenu.addItem(NSMenuItem(title: "✅ All up to date", action: nil, keyEquivalent: ""))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for formula in lines {
|
||||||
|
let item = NSMenuItem(title: formula, action: #selector(self.upgradeSingle(_:)), keyEquivalent: "")
|
||||||
|
item.representedObject = formula
|
||||||
|
outdatedSubmenu.addItem(item)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func updateStatus(count: Int) {
|
||||||
|
if count == 0 {
|
||||||
|
statusMenuItem.title = "✅ All up to date"
|
||||||
|
} else {
|
||||||
|
statusMenuItem.title = "⚠️ \(count) outdated"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@objc func upgradeSingle(_ sender: NSMenuItem) {
|
||||||
|
guard let formula = sender.representedObject as? String else { return }
|
||||||
|
|
||||||
|
runBrew("upgrade \(formula)") { _ in
|
||||||
|
self.refreshAll()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func refreshAll() {
|
||||||
|
statusMenuItem.title = "Updating..."
|
||||||
|
|
||||||
|
runBrew("update") { _ in
|
||||||
|
self.fetchOutdated() // ✅ ONLY place calling outdated
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ✅ Brew version (correct)
|
||||||
|
func refreshBrewVersion() {
|
||||||
|
runBrew("--version") { output in
|
||||||
|
let firstLine = output.split(separator: "\n").first.map(String.init) ?? "Unknown"
|
||||||
|
|
||||||
|
DispatchQueue.main.async {
|
||||||
|
self.versionItem.title = "🏷 \(firstLine)"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Logs
|
||||||
|
|
||||||
|
func log(_ text: String) {
|
||||||
|
DispatchQueue.main.async {
|
||||||
|
self.logBuffer += text
|
||||||
|
self.logWindow?.update(text: self.logBuffer)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@objc func showLogs() {
|
||||||
|
if logWindow == nil {
|
||||||
|
logWindow = LogWindowController()
|
||||||
|
}
|
||||||
|
logWindow?.showWindow(nil)
|
||||||
|
logWindow?.update(text: logBuffer)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
//
|
|
||||||
// ContentView.swift
|
|
||||||
// BrewBar
|
|
||||||
//
|
|
||||||
// Created by Maxence Socheleau on 26.06.2026.
|
|
||||||
//
|
|
||||||
|
|
||||||
import SwiftUI
|
|
||||||
|
|
||||||
struct ContentView: View {
|
|
||||||
var body: some View {
|
|
||||||
VStack {
|
|
||||||
Image(systemName: "globe")
|
|
||||||
.imageScale(.large)
|
|
||||||
.foregroundStyle(.tint)
|
|
||||||
Text("Hello, world!")
|
|
||||||
}
|
|
||||||
.padding()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#Preview {
|
|
||||||
ContentView()
|
|
||||||
}
|
|
||||||
8
BrewBar/Info.plist
Normal file
8
BrewBar/Info.plist
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>CFBundleGetInfoString</key>
|
||||||
|
<string></string>
|
||||||
|
</dict>
|
||||||
|
</plist>
|
||||||
36
BrewBar/LogWindowController.swift
Normal file
36
BrewBar/LogWindowController.swift
Normal file
|
|
@ -0,0 +1,36 @@
|
||||||
|
import Cocoa
|
||||||
|
|
||||||
|
class LogWindowController: NSWindowController {
|
||||||
|
|
||||||
|
var textView: NSTextView!
|
||||||
|
|
||||||
|
convenience init() {
|
||||||
|
|
||||||
|
let contentRect = NSRect(x: 0, y: 0, width: 600, height: 400)
|
||||||
|
let styleMask: NSWindow.StyleMask = [.titled, .closable, .resizable]
|
||||||
|
|
||||||
|
let window = NSWindow(contentRect: contentRect,
|
||||||
|
styleMask: styleMask,
|
||||||
|
backing: .buffered,
|
||||||
|
defer: false)
|
||||||
|
|
||||||
|
self.init(window: window)
|
||||||
|
|
||||||
|
window.title = "Logs"
|
||||||
|
|
||||||
|
let scrollView = NSScrollView(frame: window.contentView!.bounds)
|
||||||
|
scrollView.autoresizingMask = [.width, .height]
|
||||||
|
|
||||||
|
textView = NSTextView(frame: scrollView.bounds)
|
||||||
|
textView.isEditable = false
|
||||||
|
textView.autoresizingMask = [.width, .height]
|
||||||
|
|
||||||
|
scrollView.documentView = textView
|
||||||
|
window.contentView?.addSubview(scrollView)
|
||||||
|
}
|
||||||
|
|
||||||
|
func update(text: String) {
|
||||||
|
textView.string = text
|
||||||
|
textView.scrollToEndOfDocument(nil)
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue