CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息
Swift appkitcodexcodex-clideveloper-toolsmacosmacos-appmenu-bar-appopenai-codexproductivityswiftswiftuiusage-tracker
fix: 修复已准备更新的安装流程
Bob1c6bb41b1a02
diff --git a/CodexBar/Resources/Localizable.xcstrings b/CodexBar/Resources/Localizable.xcstringsindex c3e1381..9caa80d 100644--- a/CodexBar/Resources/Localizable.xcstrings+++ b/CodexBar/Resources/Localizable.xcstrings@@ -6353,6 +6353,22 @@}}},+ "updater.status.ready-to-install.settings" : {+ "localizations" : {+ "en" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Click to install v%@"+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "点击安装 v%@"+ }+ }+ }+ },"updater.status.up-to-date" : {"localizations" : {"en" : {diff --git a/CodexBar/Services/Updates/AppUpdater.swift b/CodexBar/Services/Updates/AppUpdater.swiftindex 4711214..456a8e5 100644--- a/CodexBar/Services/Updates/AppUpdater.swift+++ b/CodexBar/Services/Updates/AppUpdater.swift@@ -6,11 +6,25 @@ import Sparkle/// Sparkle 更新状态桥接层, 同时驱动设置窗和菜单面板的更新提示@MainActorfinal class AppUpdater: NSObject, ObservableObject {- @Published private(set) var settingsStatusMessage: String?- @Published private(set) var panelUpdateMessage: String?+ @Published private var settingsCheckMessage: String?+ @Published private var pendingInstallation: (version: String, install: () -> Void)?@Published private(set) var availableUpdateMessage: String?@Published private(set) var automaticallyChecksForUpdates = false+ var settingsStatusMessage: String? {+ if let pendingInstallation {+ return String(+ localized: "updater.status.ready-to-install.settings",+ defaultValue: "\(pendingInstallation.version)"+ )+ }+ return settingsCheckMessage+ }++ var isUpdateReadyToInstall: Bool {+ pendingInstallation != nil+ }+var canConfigureAutomaticChecks: Bool {updaterController != nil}@@ -24,8 +38,8 @@ final class AppUpdater: NSObject, ObservableObject {}private static let missingUpdateConfigurationMessage = String(localized: "updater.status.missing-configuration")- /// Sparkle 可能既不回调 didFindValidUpdate / didNotFindUpdate 也不回调 didAbortWithError- /// (后台检查已在进行, 或 feed 请求被放弃), 超时复位避免永久停留在手动检查态+ /// Sparkle 启动失败时检查请求可能直接返回, 不触发完成回调+ /// 兜底复位手动检查状态, 避免后续后台结果被误认为手动检查private static let manualCheckTimeout = Duration.seconds(30)init(bundle: Bundle = .main) {@@ -47,17 +61,19 @@ final class AppUpdater: NSObject, ObservableObject {}func checkForUpdates() {- guard let updaterController else {- showSettingsStatusMessage(Self.missingUpdateConfigurationMessage)+ if availableUpdateMessage != nil {+ clearSettingsStatusMessage()return}- if let availableUpdateMessage {- showSettingsStatusMessage(availableUpdateMessage, autoDismissDelay: nil)+ guard let updaterController else {+ showSettingsStatusMessage(Self.missingUpdateConfigurationMessage)return}- AppLog.app.notice("更新检查开始: trigger=\(LogTrigger.manual.rawValue, privacy: .public)")+ guard !updaterController.updater.sessionInProgress else { return }++ AppLog.app.notice("检查更新开始: trigger=\(LogTrigger.manual.rawValue, privacy: .public)")beginManualCheck()showSettingsStatusMessage(String(localized: "updater.status.checking")@@ -66,11 +82,19 @@ final class AppUpdater: NSObject, ObservableObject {}func startUpdate() {+ if let pendingInstallation {+ // 退出被取消后仍可重试, 直到 Sparkle 结束更新会话才释放回调+ pendingInstallation.install()+ return+ }+guard let updaterController else {showSettingsStatusMessage(Self.missingUpdateConfigurationMessage)return}+ guard updaterController.updater.canCheckForUpdates else { return }+NSApplication.shared.activate()updaterController.checkForUpdates(nil)}@@ -108,25 +132,26 @@ final class AppUpdater: NSObject, ObservableObject {isManualCheckInProgress ? .manual : .auto}- /// 手动检查态只影响结果去向 (设置窗 vs 菜单面板), 复位失败会永久隐藏面板更新提示+ /// 手动检查态决定是否在设置窗显示检查结果, 检查结束后统一复位private func finishManualCheck() {manualCheckTimeoutTask?.cancel()manualCheckTimeoutTask = nil}- private func showSettingsStatusMessage(_ message: String, autoDismissDelay: Duration? = .seconds(3)) {+ private func clearSettingsStatusMessage() {clearSettingsStatusMessageTask?.cancel()- settingsStatusMessage = message+ clearSettingsStatusMessageTask = nil+ settingsCheckMessage = nil+ }- guard let autoDismissDelay else {- clearSettingsStatusMessageTask = nil- return- }+ private func showSettingsStatusMessage(_ message: String, autoDismissDelay: Duration = .seconds(3)) {+ clearSettingsStatusMessage()+ settingsCheckMessage = messageclearSettingsStatusMessageTask = Task { [weak self] intry? await Task.sleep(for: autoDismissDelay)guard !Task.isCancelled else { return }- self?.settingsStatusMessage = nil+ self?.settingsCheckMessage = nil}}@@ -144,6 +169,39 @@ final class AppUpdater: NSObject, ObservableObject {}extension AppUpdater: SPUUpdaterDelegate {+ func updater(+ _: SPUUpdater,+ willInstallUpdateOnQuit item: SUAppcastItem,+ immediateInstallationBlock immediateInstallHandler: @escaping () -> Void+ ) -> Bool {+ // 保留当前安装会话, 避免重新检查时恢复已下载更新的信息+ pendingInstallation = (item.displayVersionString, immediateInstallHandler)+ return true+ }++ func updater(_: SPUUpdater, didFinishUpdateCycleFor _: SPUUpdateCheck, error: Error?) {+ pendingInstallation = nil+ defer { finishManualCheck() }++ guard let error else { return }+ let errorCode = (error as NSError).code+ // 没有更新和稍后授权不作为检查失败处理+ guard errorCode != Int(SUError.noUpdateError.rawValue),+ errorCode != Int(SUError.installationAuthorizeLaterError.rawValue) else { return }++ let details = LogFields.joined(+ "trigger=\(checkTrigger.rawValue)",+ "detail=\(error.localizedDescription)"+ )+ AppLog.app.error("检查更新失败: \(details, privacy: .public)")++ if isManualCheckInProgress {+ showSettingsStatusMessage(+ String(localized: "updater.status.check-failed")+ )+ }+ }+func updater(_: SPUUpdater, didFindValidUpdate item: SUAppcastItem) {let version = item.displayVersionStringlet message = String(@@ -157,12 +215,10 @@ extension AppUpdater: SPUUpdaterDelegate {"result=available","version=\(version)")- AppLog.app.notice("更新检查完成: \(details, privacy: .public)")+ AppLog.app.notice("检查更新完成: \(details, privacy: .public)")if isManualCheckInProgress {- showSettingsStatusMessage(message, autoDismissDelay: nil)- } else {- panelUpdateMessage = message+ clearSettingsStatusMessage()}finishManualCheck()@@ -170,13 +226,12 @@ extension AppUpdater: SPUUpdaterDelegate {func updaterDidNotFindUpdate(_: SPUUpdater, error _: Error) {availableUpdateMessage = nil- panelUpdateMessage = nillet trigger = checkTrigger.rawValuelet details = LogFields.joined("trigger=\(trigger)","result=upToDate")- AppLog.app.notice("更新检查完成: \(details, privacy: .public)")+ AppLog.app.notice("检查更新完成: \(details, privacy: .public)")if isManualCheckInProgress {showSettingsStatusMessage(@@ -187,26 +242,4 @@ extension AppUpdater: SPUUpdaterDelegate {finishManualCheck()}-- func updater(_: SPUUpdater, didAbortWithError error: Error) {- // 没有可用更新时 Sparkle 也会走这个回调, 那不是失败- // 这一轮的结果已由 updaterDidNotFindUpdate 记成 result=upToDate- if (error as NSError).code != Int(SUError.noUpdateError.rawValue) {- let trigger = checkTrigger.rawValue- let details = LogFields.joined(- "trigger=\(trigger)",- "detail=\(error.localizedDescription)"- )- AppLog.app.error("更新检查失败: \(details, privacy: .public)")- }-- guard isManualCheckInProgress else {- return- }-- showSettingsStatusMessage(- String(localized: "updater.status.check-failed")- )- finishManualCheck()- }}diff --git a/CodexBar/Views/Menu/CodexStatusMenuSections.swift b/CodexBar/Views/Menu/CodexStatusMenuSections.swiftindex 6a5fc88..08150ff 100644--- a/CodexBar/Views/Menu/CodexStatusMenuSections.swift+++ b/CodexBar/Views/Menu/CodexStatusMenuSections.swift@@ -280,7 +280,6 @@ struct UpdatedAtRow: View {let isCountdownActive: Boollet syncDisplayState: SyncDisplayStatelet updateMessage: String?- let startUpdate: () -> Voidvar body: some View {HStack {@@ -314,7 +313,6 @@ struct UpdatedAtRow: View {.lineLimit(1).numericTransition(value: updateMessage, enabled: allowsAnimations).transition(.opacity)- .onTapGesture(count: 2, perform: startUpdate)}Image(systemName: syncDisplayState.symbolName)diff --git a/CodexBar/Views/Menu/CodexStatusMenuView.swift b/CodexBar/Views/Menu/CodexStatusMenuView.swiftindex b05f169..fa87048 100644--- a/CodexBar/Views/Menu/CodexStatusMenuView.swift+++ b/CodexBar/Views/Menu/CodexStatusMenuView.swift@@ -278,8 +278,7 @@ private extension CodexStatusMenuView {syncDisplayState: SyncDisplayState(settings: syncSettings),- updateMessage: appUpdater.panelUpdateMessage,- startUpdate: appUpdater.startUpdate+ updateMessage: appUpdater.availableUpdateMessage)}}diff --git a/CodexBar/Views/Settings/AppSettingsView.swift b/CodexBar/Views/Settings/AppSettingsView.swiftindex e67ff85..a732d82 100644--- a/CodexBar/Views/Settings/AppSettingsView.swift+++ b/CodexBar/Views/Settings/AppSettingsView.swift@@ -929,7 +929,7 @@ private extension AppSettingsView {Button {appUpdater.startUpdate()} label: {- Image(systemName: "arrow.down.circle.fill")+ Image(systemName: appUpdater.isUpdateReadyToInstall ? "square.and.arrow.down" : "arrow.down.circle.fill").imageScale(.large)}.controlSize(.small)