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

👌 Did someone say "out of range"?

Browse Source
This commit is contained in:
Nico Verbruggen
2023-03-13 21:08:24 +01:00
parent a6aecff557
commit 7b7a5e5236
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpmon/Common/PHP/PhpVersionInstaller.swift
View File

@ -94,7 +94,7 @@ public class PhpVersionInstaller {
if process.terminationStatus <= 0 {
Task { @MainActor in
subject.progress = 100
subject.progress = 1
}
await PhpEnv.detectPhpVersions()
@ -109,6 +109,8 @@ public class PhpVersionInstaller {
subject.description = "The operation failed."
}
}
} else {
Log.err("\(version) is not contained within installable list")
}
}
@ -122,22 +124,22 @@ public class PhpVersionInstaller {
private static func reportInstallationProgress(_ text: String) -> Double? {
if text.contains("Fetching") {
return 10
return 0.1
}
if text.contains("Downloading") {
return 25
return 0.25
}
if text.contains("Already downloaded") || text.contains("Downloaded") {
return 50
return 0.50
}
if text.contains("Installing") {
return 60
return 0.60
}
if text.contains("Pouring") {
return 80
return 0.80
}
if text.contains("Summary") {
return 100
return 1
}
return nil
}

9
phpmon/Domain/Menu/StatusMenu+Items.swift
View File

@ -100,7 +100,7 @@ extension StatusMenu {
? "Install PHP \(result.version)..."
: "Remove PHP \(result.version)..."
var action: Selector? = result.action == .install
let action: Selector? = result.action == .install
? #selector(MainMenu.installPhpVersion(sender:))
: #selector(MainMenu.removePhpVersion(sender:))
@ -108,11 +108,14 @@ extension StatusMenu {
continue
}
addItem(PhpMenuItem(
let menuItem = PhpMenuItem(
title: title,
action: action,
keyEquivalent: ""
))
)
menuItem.version = result.version
addItem(menuItem)
}
if !PhpEnv.shared.incompatiblePhpVersions.isEmpty {