mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-10-16 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

macOS: Move update view model over to App scope

Browse Source
This commit is contained in:
Mitchell Hashimoto
2025-10-08 12:40:42 -07:00
parent 09ba5a27a2
commit fc347a6040
2 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
macos/Sources/App/macOS/AppDelegate.swift
View File

@@ -101,6 +101,9 @@ class AppDelegate: NSObject,
/// Manages updates
let updaterController: SPUStandardUpdaterController
let updaterDelegate: UpdaterDelegate = UpdaterDelegate()
/// Update view model for UI display
@Published private(set) var updateUIModel = UpdateViewModel()
/// The elapsed time since the process was started
var timeSinceLaunch: TimeInterval {
@@ -1008,24 +1011,16 @@ class AppDelegate: NSObject,
// Demo mode: simulate update check instead of real Sparkle check
// TODO: Replace with real updaterController.checkForUpdates(sender) when SPUUserDriver is implemented
guard let terminalWindow = NSApp.keyWindow as? TerminalWindow else {
// Fallback to real update check if no terminal window
updaterController.checkForUpdates(sender)
return
}
let model = terminalWindow.updateUIModel
// Simulate the full update check flow
model.state = .checking
model.progress = nil
model.details = nil
model.error = nil
updateUIModel.state = .checking
updateUIModel.progress = nil
updateUIModel.details = nil
updateUIModel.error = nil
DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
// Simulate finding an update
model.state = .updateAvailable
model.details = .init(
self.updateUIModel.state = .updateAvailable
self.updateUIModel.details = .init(
version: "1.2.0",
build: "demo",
size: "42 MB",

72
macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift
View File

@@ -17,7 +17,6 @@ class TerminalWindow: NSWindow {
/// Update notification UI in titlebar
private let updateAccessory = NSTitlebarAccessoryViewController()
private(set) var updateUIModel = UpdateViewModel()
/// The configuration derived from the Ghostty config so we don't need to rely on references.
private(set) var derivedConfig: DerivedConfig = .init()
@@ -94,7 +93,7 @@ class TerminalWindow: NSWindow {
updateAccessory.layoutAttribute = .right
updateAccessory.view = NSHostingView(rootView: UpdateAccessoryView(
viewModel: viewModel,
model: updateUIModel,
model: appDelegate.updateUIModel,
actions: createUpdateActions()
))
addTitlebarAccessoryViewController(updateAccessory)
@@ -457,48 +456,60 @@ class TerminalWindow: NSWindow {
// MARK: Update UI
private func createUpdateActions() -> UpdateUIActions {
UpdateUIActions(
allowAutoChecks: { [weak self] in
guard let appDelegate = NSApp.delegate as? AppDelegate else {
return UpdateUIActions(
allowAutoChecks: {},
denyAutoChecks: {},
cancel: {},
install: {},
remindLater: {},
skipThisVersion: {},
showReleaseNotes: {},
retry: {}
)
}
return UpdateUIActions(
allowAutoChecks: {
print("Demo: Allow auto checks")
self?.updateUIModel.state = .idle
appDelegate.updateUIModel.state = .idle
},
denyAutoChecks: { [weak self] in
denyAutoChecks: {
print("Demo: Deny auto checks")
self?.updateUIModel.state = .idle
appDelegate.updateUIModel.state = .idle
},
cancel: { [weak self] in
cancel: {
print("Demo: Cancel")
self?.updateUIModel.state = .idle
appDelegate.updateUIModel.state = .idle
},
install: { [weak self] in
guard let self else { return }
install: {
print("Demo: Install - simulating download and install flow")
// Start downloading
self.updateUIModel.state = .downloading
self.updateUIModel.progress = 0.0
appDelegate.updateUIModel.state = .downloading
appDelegate.updateUIModel.progress = 0.0
// Simulate download progress
for i in 1...10 {
DispatchQueue.main.asyncAfter(deadline: .now() + Double(i) * 0.3) {
self.updateUIModel.progress = Double(i) / 10.0
appDelegate.updateUIModel.progress = Double(i) / 10.0
if i == 10 {
// Move to extraction
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
self.updateUIModel.state = .extracting
self.updateUIModel.progress = 0.0
appDelegate.updateUIModel.state = .extracting
appDelegate.updateUIModel.progress = 0.0
// Simulate extraction progress
for j in 1...5 {
DispatchQueue.main.asyncAfter(deadline: .now() + Double(j) * 0.3) {
self.updateUIModel.progress = Double(j) / 5.0
appDelegate.updateUIModel.progress = Double(j) / 5.0
if j == 5 {
// Move to ready to install
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
self.updateUIModel.state = .readyToInstall
self.updateUIModel.progress = nil
appDelegate.updateUIModel.state = .readyToInstall
appDelegate.updateUIModel.progress = nil
}
}
}
@@ -508,29 +519,28 @@ class TerminalWindow: NSWindow {
}
}
},
remindLater: { [weak self] in
remindLater: {
print("Demo: Remind later")
self?.updateUIModel.state = .idle
appDelegate.updateUIModel.state = .idle
},
skipThisVersion: { [weak self] in
skipThisVersion: {
print("Demo: Skip version")
self?.updateUIModel.state = .idle
appDelegate.updateUIModel.state = .idle
},
showReleaseNotes: { [weak self] in
showReleaseNotes: {
print("Demo: Show release notes")
guard let url = URL(string: "https://github.com/ghostty-org/ghostty/releases") else { return }
NSWorkspace.shared.open(url)
},
retry: { [weak self] in
guard let self else { return }
retry: {
print("Demo: Retry - simulating update check")
self.updateUIModel.state = .checking
self.updateUIModel.progress = nil
self.updateUIModel.error = nil
appDelegate.updateUIModel.state = .checking
appDelegate.updateUIModel.progress = nil
appDelegate.updateUIModel.error = nil
DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
self.updateUIModel.state = .updateAvailable
self.updateUIModel.details = .init(
appDelegate.updateUIModel.state = .updateAvailable
appDelegate.updateUIModel.details = .init(
version: "1.2.0",
build: "demo",
size: "42 MB",