TuringSoftware/CrystalFetch
1
1
Fork 0
mirror of https://github.com/TuringSoftware/CrystalFetch.git synced 2025-12-25 23:10:31 +08:00
Code Issues Projects Releases Packages Wiki Activity

worker: improve progress display

Browse source
This commit is contained in:
osy 2023-07-26 12:46:15 -07:00
parent bd9ba1e51e
commit fbddcfab74
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Source/Worker.swift
View file

@ -133,7 +133,8 @@ class Worker: ObservableObject {
let total = ByteCountFormatter.string(fromByteCount: bytesTotal, countStyle: .file)
Task { @MainActor in
self.progressStatus = String.localizedStringWithFormat(NSLocalizedString("Downloading %@ of %@...", comment: "Worker"), written, total)
self.progress = (Float(bytesWritten) / Float(bytesTotal))
let progress = (Float(bytesWritten) / Float(bytesTotal))
self.progress = progress > 1.0 ? 1.0 : progress
}
}
progressStatus = NSLocalizedString("Converting download to ISO...", comment: "Worker")
@ -142,6 +143,16 @@ class Worker: ObservableObject {
}
}
private nonisolated func extractLine(from data: Data) -> String? {
if let string = String(data: data, encoding: .ascii)?.filter({ $0.isASCII }) {
let lines = string.split(whereSeparator: \.isNewline)
if let line = lines.filter({ !$0.isEmpty }).last {
return String(line)
}
}
return nil
}
private func convert(files url: URL) async throws {
let script = Bundle.main.url(forResource: "convert", withExtension: "sh")!
let executablePath = Bundle.main.executableURL!.deletingLastPathComponent().path
@ -152,7 +163,7 @@ class Worker: ObservableObject {
process.arguments = ["wim", ".", "1"]
let outputPipe = Pipe()
outputPipe.fileHandleForReading.readabilityHandler = { handle in
if let line = String(data: handle.availableData, encoding: .ascii)?.filter({ $0.isASCII }), !line.isEmpty {
if let line = self.extractLine(from: handle.availableData) {
NSLog("[convert.sh stdout]: %@", line)
Task { @MainActor in
self.progressStatus = line
@ -161,7 +172,7 @@ class Worker: ObservableObject {
}
let errorPipe = Pipe()
errorPipe.fileHandleForReading.readabilityHandler = { handle in
if let line = String(data: handle.availableData, encoding: .ascii)?.filter({ $0.isASCII }), !line.isEmpty {
if let line = self.extractLine(from: handle.availableData) {
NSLog("[convert.sh stderr]: %@", line)
Task { @MainActor in
self.lastErrorLine = line