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

🏗 Health check in UI

Browse Source
This commit is contained in:
Nico Verbruggen
2023-05-06 21:03:13 +02:00
parent bf610b6c4e
commit b307251f81
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpmon/Common/PHP/PhpInstallation.swift
View File

@ -45,7 +45,9 @@ class PhpInstallation {
withStandardError: true
).trimmingCharacters(in: .whitespacesAndNewlines)
if testCommand.contains("Library not loaded") {
// If the "dyld: Library not loaded" issue pops up, we have an unhealthy PHP installation
// and we will need to reinstall this version of PHP via Homebrew.
if testCommand.contains("Library not loaded") && testCommand.contains("dyld") {
self.isHealthy = false
Log.err("The PHP installation of \(self.versionNumber.short) is not healthy!")
}

17
phpmon/Domain/Integrations/Homebrew/BrewFormula.swift
View File

@ -39,8 +39,19 @@ struct BrewFormula {
return "\(Paths.optPath)/\(resolved)/bin"
}
public func isHealthy() -> Bool {
return true
// #error("This must check if the PHP version works")
var shortVersion: String? {
guard let version = self.installedVersion else {
return nil
}
return VersionNumber.make(from: version)?.short ?? nil
}
public func isHealthy() -> Bool? {
guard let shortVersion = self.shortVersion else {
return nil
}
return PhpEnv.shared.cachedPhpInstallations[shortVersion]?.isHealthy ?? nil
}
}

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

@ -133,7 +133,14 @@ struct PhpFormulaeView: View {
.padding(.horizontal, 5)
VStack(alignment: .leading) {
Text(formula.displayName).bold()
// Text(formula.homebrewFolder)
if formula.isHealthy() == nil {
Text("Unknown health")
} else {
Text(formula.isHealthy()! ? "Health OK" : "Broken!")
}
Text(formula.homebrewFolder)
if formula.isInstalled && formula.hasUpgrade {
Text("\(formula.installedVersion!) installed, \(formula.upgradeVersion!) available.")