phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-08-07 03:50:08 +02:00
Code Releases Activity

👌 Sync global & window busy indicator

Browse Source
This commit is contained in:
Nico Verbruggen
2023-03-22 21:58:50 +01:00
parent 9c8da2aa1c
commit 6aff283d08
2 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpmon/Common/PHP/PHP Version/PhpEnv.swift
View File

@ -40,7 +40,14 @@ class PhpEnv {
static let shared = PhpEnv() static let shared = PhpEnv()
/** Whether the switcher is busy performing any actions. */ /** Whether the switcher is busy performing any actions. */
var isBusy: Bool = false var isBusy: Bool = false {
didSet {
Task { @MainActor in
MainMenu.shared.setBusyImage()
MainMenu.shared.rebuild()
}
}
}
/** All versions of PHP that are currently supported. */ /** All versions of PHP that are currently supported. */
var availablePhpVersions: [String] = [] var availablePhpVersions: [String] = []

34
phpmon/Domain/SwiftUI/PhpManager/PhpFormulaeView.swift
View File

@ -150,7 +150,7 @@ struct PhpFormulaeView: View {
let command = InstallPhpVersionCommand(formula: formula.name) let command = InstallPhpVersionCommand(formula: formula.name)
do { do {
PhpEnv.shared.isBusy = true self.setBusyStatus(true)
try await command.execute { progress in try await command.execute { progress in
Task { @MainActor in Task { @MainActor in
self.status.title = progress.title self.status.title = progress.title
@ -158,16 +158,13 @@ struct PhpFormulaeView: View {
self.status.busy = progress.value != 1 self.status.busy = progress.value != 1
if progress.value == 1 { if progress.value == 1 {
PhpEnv.shared.isBusy = false self.setBusyStatus(false)
await self.handler.refreshPhpVersions(loadOutdated: false) await self.handler.refreshPhpVersions(loadOutdated: false)
} }
} }
} }
} catch { } catch {
PhpEnv.shared.isBusy = false self.setBusyStatus(false)
Task { @MainActor in
self.status.busy = false
}
self.presentErrorAlert( self.presentErrorAlert(
title: "phpman.failures.install.title".localized, title: "phpman.failures.install.title".localized,
description: "phpman.failures.install.desc".localized( description: "phpman.failures.install.desc".localized(
@ -182,7 +179,7 @@ struct PhpFormulaeView: View {
let command = RemovePhpVersionCommand(formula: formula.name) let command = RemovePhpVersionCommand(formula: formula.name)
do { do {
PhpEnv.shared.isBusy = true self.setBusyStatus(true)
try await command.execute { progress in try await command.execute { progress in
Task { @MainActor in Task { @MainActor in
self.status.title = progress.title self.status.title = progress.title
@ -191,15 +188,12 @@ struct PhpFormulaeView: View {
if progress.value == 1 { if progress.value == 1 {
await self.handler.refreshPhpVersions(loadOutdated: false) await self.handler.refreshPhpVersions(loadOutdated: false)
PhpEnv.shared.isBusy = false self.setBusyStatus(false)
} }
} }
} }
} catch { } catch {
PhpEnv.shared.isBusy = false self.setBusyStatus(false)
Task { @MainActor in
self.status.busy = false
}
self.presentErrorAlert( self.presentErrorAlert(
title: "phpman.failures.uninstall.title".localized, title: "phpman.failures.uninstall.title".localized,
description: "phpman.failures.uninstall.desc".localized( description: "phpman.failures.uninstall.desc".localized(
@ -210,6 +204,22 @@ struct PhpFormulaeView: View {
} }
} }
public func setBusyStatus(_ busy: Bool) {
PhpEnv.shared.isBusy = busy
if busy {
Task { @MainActor in
MainMenu.shared.setBusyImage()
MainMenu.shared.rebuild()
self.status.busy = busy
}
} else {
Task { @MainActor in
MainMenu.shared.updatePhpVersionInStatusBar()
self.status.busy = busy
}
}
}
public func presentErrorAlert(title: String, description: String, button: String) { public func presentErrorAlert(title: String, description: String, button: String) {
Alert.confirm( Alert.confirm(
onWindow: App.shared.versionManagerWindowController!.window!, onWindow: App.shared.versionManagerWindowController!.window!,