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

👌 Add runComposerUpdateShellCommand method

Browse Source
This commit is contained in:
Nico Verbruggen
2022-09-30 23:45:32 +02:00
parent 572330eaa1
commit 86eb295489
2 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
phpmon/Domain/Integrations/Composer/ComposerWindow.swift
View File

@ -44,35 +44,40 @@ import Foundation
private func performComposerUpdate() async {
do {
let command = "\(Paths.composer!) global update"
DispatchQueue.main.async {
self.window?.addToConsole("\(command)\n")
}
let (process, _) = try await Shell.attach(
command,
didReceiveOutput: { [weak self] output in
if output.hasError {
DispatchQueue.main.async { self?.window?.addToConsole(output.err) }
}
if !output.out.isEmpty {
DispatchQueue.main.async { self?.window?.addToConsole(output.out) }
}
},
withTimeout: .minutes(5)
)
if process.terminationStatus <= 0 {
composerUpdateSucceeded()
} else {
composerUpdateFailed()
}
try await runComposerUpdateShellCommand()
} catch {
composerUpdateFailed()
}
}
private func runComposerUpdateShellCommand() async throws {
let command = "\(Paths.composer!) global update"
self.window?.addToConsole("\(command)\n")
let (process, _) = try await Shell.attach(
command,
didReceiveOutput: { [weak self] output in
guard let window = self?.window else { return }
if output.hasError {
window.addToConsole(output.err)
}
if !output.out.isEmpty {
window.addToConsole(output.out)
}
},
withTimeout: .minutes(5)
)
if process.terminationStatus <= 0 {
composerUpdateSucceeded()
} else {
composerUpdateFailed()
}
}
private func composerUpdateSucceeded() {
// Closing the window should happen after a slight delay
DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) { [self] in

12
phpmon/Domain/Progress/TerminalProgressWindowController.swift
View File

@ -35,12 +35,14 @@ class TerminalProgressWindowController: NSWindowController, NSWindowDelegate {
}
public func addToConsole(_ string: String) {
guard let textView = self.progressView?.textView else {
return
}
DispatchQueue.main.async {
guard let textView = self.progressView?.textView else {
return
}
textView.string += string
textView.scrollToEndOfDocument(nil)
textView.string += string
textView.scrollToEndOfDocument(nil)
}
}
public func setType(info: Bool = true) {