Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b2b85ae835 | ||
|
|
09f433106d | ||
|
|
891a504ee7 | ||
|
|
f681e60778 | ||
|
|
0d0233e8d6 | ||
|
|
d117d7a510 |
@@ -14,13 +14,21 @@ jobs:
|
|||||||
build-and-test:
|
build-and-test:
|
||||||
# Prefer a self-hosted Mac runner if your Gitea has one. If not,
|
# Prefer a self-hosted Mac runner if your Gitea has one. If not,
|
||||||
# macos-14 works for this pipeline.
|
# macos-14 works for this pipeline.
|
||||||
runs-on: macos-14
|
runs-on: macos-12
|
||||||
env:
|
env:
|
||||||
DERIVED: build/DerivedData-test
|
DERIVED: build/DerivedData-test
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Assert Xcode 14 toolchain
|
||||||
|
run: xcodebuild -version | grep -E "Xcode 14." || (echo "Unexpected Xcode version" && exit 1)
|
||||||
|
|
||||||
|
- name: Ensure host tools
|
||||||
|
run: |
|
||||||
|
command -v xcodegen || brew install xcodegen
|
||||||
|
python3 -c "import dmgbuild" 2>/dev/null || pip3 install dmgbuild
|
||||||
|
|
||||||
- name: Generate Xcode project
|
- name: Generate Xcode project
|
||||||
run: xcodegen generate --spec project.yml
|
run: xcodegen generate --spec project.yml
|
||||||
|
|
||||||
@@ -120,7 +128,7 @@ jobs:
|
|||||||
|
|
||||||
package:
|
package:
|
||||||
needs: build-and-test
|
needs: build-and-test
|
||||||
runs-on: macos-14
|
runs-on: macos-12
|
||||||
if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags/v')
|
if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags/v')
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
// swift-tools-version: 6.0
|
// swift-tools-version: 5.7
|
||||||
import PackageDescription
|
import PackageDescription
|
||||||
|
|
||||||
let package = Package(
|
let package = Package(
|
||||||
name: "ICCeryCore",
|
name: "ICCeryCore",
|
||||||
platforms: [.macOS(.v14)],
|
platforms: [.macOS(.v12)],
|
||||||
products: [
|
products: [
|
||||||
.library(name: "ICCeryCore", targets: ["ICCeryCore"]),
|
.library(name: "ICCeryCore", targets: ["ICCeryCore"]),
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -200,7 +200,7 @@ public struct ArgyllRunner: Sendable {
|
|||||||
await processManager.kill(id: id)
|
await processManager.kill(id: id)
|
||||||
var attempts = 0
|
var attempts = 0
|
||||||
while await processManager.isRunning(id), attempts < 30 {
|
while await processManager.isRunning(id), attempts < 30 {
|
||||||
try? await Task.sleep(for: .milliseconds(100))
|
try? await Task.sleep(nanoseconds: 100_000_000)
|
||||||
attempts += 1
|
attempts += 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -243,7 +243,7 @@ public struct ArgyllRunner: Sendable {
|
|||||||
if flushPartialLines {
|
if flushPartialLines {
|
||||||
dotFlushTask = Task { [processManager] in
|
dotFlushTask = Task { [processManager] in
|
||||||
while !Task.isCancelled {
|
while !Task.isCancelled {
|
||||||
try? await Task.sleep(for: .milliseconds(500))
|
try? await Task.sleep(nanoseconds: 500_000_000)
|
||||||
if Task.isCancelled { break }
|
if Task.isCancelled { break }
|
||||||
await processManager.flushPartialLine(id: processId)
|
await processManager.flushPartialLine(id: processId)
|
||||||
}
|
}
|
||||||
@@ -592,7 +592,7 @@ public struct ArgyllRunner: Sendable {
|
|||||||
await processManager.setPreKillHook(id: processId) { [processManager] in
|
await processManager.setPreKillHook(id: processId) { [processManager] in
|
||||||
if isXY {
|
if isXY {
|
||||||
try? await processManager.sendStdin(id: processId, bytes: ChartreadInput.quit.bytes)
|
try? await processManager.sendStdin(id: processId, bytes: ChartreadInput.quit.bytes)
|
||||||
try? await Task.sleep(for: .milliseconds(500))
|
try? await Task.sleep(nanoseconds: 500_000_000)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ public enum CGATSParser {
|
|||||||
public static func parse(
|
public static func parse(
|
||||||
_ contents: String,
|
_ contents: String,
|
||||||
sourceURL: URL? = nil
|
sourceURL: URL? = nil
|
||||||
) throws(CGATSParseError) -> CGATSDataset {
|
) throws -> CGATSDataset {
|
||||||
guard !contents.isEmpty else { throw .emptyFile }
|
guard !contents.isEmpty else { throw .emptyFile }
|
||||||
|
|
||||||
let ext = sourceURL?.pathExtension.lowercased() ?? ""
|
let ext = sourceURL?.pathExtension.lowercased() ?? ""
|
||||||
@@ -213,7 +213,7 @@ public enum CGATSParser {
|
|||||||
private static func preprocess(
|
private static func preprocess(
|
||||||
_ contents: String,
|
_ contents: String,
|
||||||
isCSV: Bool
|
isCSV: Bool
|
||||||
) throws(CGATSParseError) -> (CGATSFormat, [String]) {
|
) throws -> (CGATSFormat, [String]) {
|
||||||
let allLines = contents.components(separatedBy: .newlines)
|
let allLines = contents.components(separatedBy: .newlines)
|
||||||
var lines = [String]()
|
var lines = [String]()
|
||||||
|
|
||||||
|
|||||||
@@ -559,7 +559,7 @@ public actor ProcessManager {
|
|||||||
// Start a watchdog in case the `readabilityHandler` EOFs never
|
// Start a watchdog in case the `readabilityHandler` EOFs never
|
||||||
// arrive after the process exits (e.g. a hung pipe).
|
// arrive after the process exits (e.g. a hung pipe).
|
||||||
child.finalizeTask = Task { [weak self] in
|
child.finalizeTask = Task { [weak self] in
|
||||||
try? await Task.sleep(for: .seconds(2))
|
try? await Task.sleep(nanoseconds: 2_000_000_000)
|
||||||
guard let self else { return }
|
guard let self else { return }
|
||||||
await self.forceKill(id: id)
|
await self.forceKill(id: id)
|
||||||
await self.forceFinalize(id: id)
|
await self.forceFinalize(id: id)
|
||||||
|
|||||||
@@ -95,13 +95,6 @@ struct CalibrationView: View {
|
|||||||
.frame(minHeight: 80, maxHeight: 120)
|
.frame(minHeight: 80, maxHeight: 120)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if let error = model.lastError {
|
|
||||||
Section {
|
|
||||||
Text(error)
|
|
||||||
.foregroundStyle(.red)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
.formStyle(.grouped)
|
.formStyle(.grouped)
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ final class CalibrationViewModel {
|
|||||||
var calibrationLog: [String] = []
|
var calibrationLog: [String] = []
|
||||||
var isGenerating = false
|
var isGenerating = false
|
||||||
var isComputing = false
|
var isComputing = false
|
||||||
var lastError: String?
|
|
||||||
|
|
||||||
init(workflow: TargetWorkflowViewModel, profile: ProfileWorkflowViewModel, environment: AppEnvironment) {
|
init(workflow: TargetWorkflowViewModel, profile: ProfileWorkflowViewModel, environment: AppEnvironment) {
|
||||||
self.workflow = workflow
|
self.workflow = workflow
|
||||||
@@ -77,10 +76,6 @@ final class CalibrationViewModel {
|
|||||||
wizard.basename = identity.calibrationBasename
|
wizard.basename = identity.calibrationBasename
|
||||||
wizard.sessionMode = .calibration
|
wizard.sessionMode = .calibration
|
||||||
|
|
||||||
isGenerating = true
|
|
||||||
calibrationLog = []
|
|
||||||
lastError = nil
|
|
||||||
|
|
||||||
let config = CalibrationTargenConfig(
|
let config = CalibrationTargenConfig(
|
||||||
colourSpace: colourSpace,
|
colourSpace: colourSpace,
|
||||||
steps: steps,
|
steps: steps,
|
||||||
@@ -92,17 +87,19 @@ final class CalibrationViewModel {
|
|||||||
)
|
)
|
||||||
|
|
||||||
Task { @MainActor in
|
Task { @MainActor in
|
||||||
defer { self.isGenerating = false }
|
|
||||||
|
|
||||||
do {
|
do {
|
||||||
_ = try await self.environment.runner.runCalibrationTargen(config: config, onLogBatch: ProcessRunSupport.logSink { [weak self] batch in
|
_ = try await ProcessRunSupport.runLogged(
|
||||||
self?.calibrationLog.append(contentsOf: batch)
|
setRunning: { self.isGenerating = $0 },
|
||||||
})
|
resetLog: { self.calibrationLog = [] },
|
||||||
|
onLog: { self.calibrationLog.append(contentsOf: $0) }
|
||||||
|
) { onLog in
|
||||||
|
try await self.environment.runner.runCalibrationTargen(
|
||||||
|
config: config, onLogBatch: onLog)
|
||||||
|
}
|
||||||
self.wizard.refreshGating()
|
self.wizard.refreshGating()
|
||||||
self.wizard.showNotice("Calibration target generated.")
|
self.wizard.showNotice("Calibration target generated.")
|
||||||
self.wizard.go(to: .layOutPrint)
|
self.wizard.go(to: .layOutPrint)
|
||||||
} catch {
|
} catch {
|
||||||
self.lastError = error.localizedDescription
|
|
||||||
self.wizard.showNotice(
|
self.wizard.showNotice(
|
||||||
"Calibration target failed: \(error.localizedDescription)",
|
"Calibration target failed: \(error.localizedDescription)",
|
||||||
kind: .error
|
kind: .error
|
||||||
@@ -137,15 +134,13 @@ final class CalibrationViewModel {
|
|||||||
// "already exists" when the user declines overwrite. We do not
|
// "already exists" when the user declines overwrite. We do not
|
||||||
// silently clobber.
|
// silently clobber.
|
||||||
if FileManager.default.fileExists(atPath: outputURL.path) {
|
if FileManager.default.fileExists(atPath: outputURL.path) {
|
||||||
lastError = "\(outputURL.lastPathComponent) already exists. Rename or overwrite it first."
|
wizard.showNotice(
|
||||||
wizard.showNotice(lastError!, kind: .error)
|
"\(outputURL.lastPathComponent) already exists. Rename or overwrite it first.",
|
||||||
|
kind: .error
|
||||||
|
)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
isComputing = true
|
|
||||||
calibrationLog = []
|
|
||||||
lastError = nil
|
|
||||||
|
|
||||||
let config = PrintcalConfig(
|
let config = PrintcalConfig(
|
||||||
ti3Basename: calBasename,
|
ti3Basename: calBasename,
|
||||||
workingDirectory: cwd,
|
workingDirectory: cwd,
|
||||||
@@ -158,19 +153,21 @@ final class CalibrationViewModel {
|
|||||||
)
|
)
|
||||||
|
|
||||||
Task { @MainActor in
|
Task { @MainActor in
|
||||||
defer { self.isComputing = false }
|
|
||||||
|
|
||||||
do {
|
do {
|
||||||
let url = try await self.environment.runner.runPrintcal(config: config, onLogBatch: ProcessRunSupport.logSink { [weak self] batch in
|
let url = try await ProcessRunSupport.runLogged(
|
||||||
self?.calibrationLog.append(contentsOf: batch)
|
setRunning: { self.isComputing = $0 },
|
||||||
})
|
resetLog: { self.calibrationLog = [] },
|
||||||
|
onLog: { self.calibrationLog.append(contentsOf: $0) }
|
||||||
|
) { onLog in
|
||||||
|
try await self.environment.runner.runPrintcal(
|
||||||
|
config: config, onLogBatch: onLog)
|
||||||
|
}
|
||||||
self.computedCalURL = url
|
self.computedCalURL = url
|
||||||
self.profile.calibrationFile = url.path
|
self.profile.calibrationFile = url.path
|
||||||
self.profile.applyCalibration = self.applyToProfile
|
self.profile.applyCalibration = self.applyToProfile
|
||||||
self.wizard.showNotice("Calibration curves computed.")
|
self.wizard.showNotice("Calibration curves computed.")
|
||||||
self.wizard.restoreCalibration()
|
self.wizard.restoreCalibration()
|
||||||
} catch {
|
} catch {
|
||||||
self.lastError = error.localizedDescription
|
|
||||||
self.wizard.showNotice(
|
self.wizard.showNotice(
|
||||||
"Calibration curve computation failed: \(error.localizedDescription)",
|
"Calibration curve computation failed: \(error.localizedDescription)",
|
||||||
kind: .error
|
kind: .error
|
||||||
|
|||||||
@@ -63,7 +63,8 @@ final class MeasurementWorkflowViewModel {
|
|||||||
var rows: [ChartreadRow] = []
|
var rows: [ChartreadRow] = []
|
||||||
var swatchRows: [SwatchRow] = []
|
var swatchRows: [SwatchRow] = []
|
||||||
var showRemoveSheetNotice = false
|
var showRemoveSheetNotice = false
|
||||||
var lastError: String?
|
/// Stage-local chartread error notice (`#chartreadLastError`, #80).
|
||||||
|
var chartreadNotice: Notice?
|
||||||
private var chartreadTask: Task<Void, Never>?
|
private var chartreadTask: Task<Void, Never>?
|
||||||
|
|
||||||
// MARK: - Averaging
|
// MARK: - Averaging
|
||||||
@@ -185,7 +186,7 @@ final class MeasurementWorkflowViewModel {
|
|||||||
isChartreadRunning = true
|
isChartreadRunning = true
|
||||||
chartreadState = .idle
|
chartreadState = .idle
|
||||||
currentPrompt = nil
|
currentPrompt = nil
|
||||||
lastError = nil
|
chartreadNotice = nil
|
||||||
chartreadLog.removeAll()
|
chartreadLog.removeAll()
|
||||||
|
|
||||||
// Optional: reset rows when starting a fresh first pass.
|
// Optional: reset rows when starting a fresh first pass.
|
||||||
@@ -227,7 +228,10 @@ final class MeasurementWorkflowViewModel {
|
|||||||
|
|
||||||
case .exit(let code):
|
case .exit(let code):
|
||||||
if code != 0 {
|
if code != 0 {
|
||||||
lastError = "chartread exited with code \(code)"
|
chartreadNotice = Notice(
|
||||||
|
kind: .error,
|
||||||
|
text: "chartread exited with code \(code)"
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
case .completed(let canonicalURL):
|
case .completed(let canonicalURL):
|
||||||
@@ -235,7 +239,7 @@ final class MeasurementWorkflowViewModel {
|
|||||||
completePass(canonicalURL: canonicalURL)
|
completePass(canonicalURL: canonicalURL)
|
||||||
|
|
||||||
case .failed(let error):
|
case .failed(let error):
|
||||||
lastError = error.localizedDescription
|
chartreadNotice = Notice(kind: .error, text: error.localizedDescription)
|
||||||
chartreadState = .error
|
chartreadState = .error
|
||||||
isChartreadRunning = false
|
isChartreadRunning = false
|
||||||
}
|
}
|
||||||
@@ -381,7 +385,10 @@ final class MeasurementWorkflowViewModel {
|
|||||||
discoverPassSnapshots()
|
discoverPassSnapshots()
|
||||||
wizard.refreshGating()
|
wizard.refreshGating()
|
||||||
} catch {
|
} catch {
|
||||||
lastError = "Could not snapshot pass: \(error.localizedDescription)"
|
chartreadNotice = Notice(
|
||||||
|
kind: .error,
|
||||||
|
text: "Could not snapshot pass: \(error.localizedDescription)"
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -397,30 +404,32 @@ final class MeasurementWorkflowViewModel {
|
|||||||
|
|
||||||
func finishAndAverage() {
|
func finishAndAverage() {
|
||||||
guard !isFinishing, let cwd = workingDirectory, !passSnapshots.isEmpty else { return }
|
guard !isFinishing, let cwd = workingDirectory, !passSnapshots.isEmpty else { return }
|
||||||
isFinishing = true
|
|
||||||
finishNotice = nil
|
finishNotice = nil
|
||||||
|
|
||||||
Task { @MainActor [weak self] in
|
Task { @MainActor [weak self] in
|
||||||
guard let self else { return }
|
guard let self else { return }
|
||||||
do {
|
do {
|
||||||
let canonical: URL
|
// No log reset: prior chartread output must be preserved.
|
||||||
if self.passSnapshots.count == 1, let pass = self.passSnapshots.first {
|
let canonical = try await ProcessRunSupport.runLogged(
|
||||||
canonical = try MeasurementArtefacts.promotePass(
|
setRunning: { self.isFinishing = $0 },
|
||||||
pass: pass,
|
resetLog: {},
|
||||||
basename: self.basename,
|
onLog: { self.chartreadLog.append(contentsOf: $0) }
|
||||||
cwd: cwd
|
) { onLog in
|
||||||
)
|
if self.passSnapshots.count == 1, let pass = self.passSnapshots.first {
|
||||||
} else {
|
return try MeasurementArtefacts.promotePass(
|
||||||
|
pass: pass,
|
||||||
|
basename: self.basename,
|
||||||
|
cwd: cwd
|
||||||
|
)
|
||||||
|
}
|
||||||
let config = AverageConfig(
|
let config = AverageConfig(
|
||||||
workingDirectory: cwd,
|
workingDirectory: cwd,
|
||||||
basename: self.basename,
|
basename: self.basename,
|
||||||
passFiles: self.passSnapshots
|
passFiles: self.passSnapshots
|
||||||
)
|
)
|
||||||
canonical = try await self.environment.runner.runAverage(
|
return try await self.environment.runner.runAverage(
|
||||||
config: config,
|
config: config,
|
||||||
onLogBatch: ProcessRunSupport.logSink { [weak self] batch in
|
onLogBatch: onLog
|
||||||
self?.chartreadLog.append(contentsOf: batch)
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
self.discoverPassSnapshots()
|
self.discoverPassSnapshots()
|
||||||
@@ -465,7 +474,6 @@ final class MeasurementWorkflowViewModel {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
self.isFinishing = false
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,14 @@ struct Notice: Identifiable, Equatable {
|
|||||||
case .error: return .red
|
case .error: return .red
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var accessibilityValue: String {
|
||||||
|
switch self {
|
||||||
|
case .info: return "info"
|
||||||
|
case .warning: return "warning"
|
||||||
|
case .error: return "error"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let id = UUID()
|
let id = UUID()
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ final class ProfileWorkflowViewModel {
|
|||||||
var isColprofRunning = false
|
var isColprofRunning = false
|
||||||
var colprofLog: [String] = []
|
var colprofLog: [String] = []
|
||||||
var colprofProgress: String?
|
var colprofProgress: String?
|
||||||
var lastError: String?
|
|
||||||
var createdProfileURL: URL?
|
var createdProfileURL: URL?
|
||||||
/// Path to the `.gam` gamut mesh extracted post-`colprof` (issue #28).
|
/// Path to the `.gam` gamut mesh extracted post-`colprof` (issue #28).
|
||||||
var createdGamutURL: URL?
|
var createdGamutURL: URL?
|
||||||
@@ -165,60 +164,59 @@ final class ProfileWorkflowViewModel {
|
|||||||
guard canCreateProfile, let _ = wizard.effectiveWorkingDirectory else { return }
|
guard canCreateProfile, let _ = wizard.effectiveWorkingDirectory else { return }
|
||||||
let config = buildColprofConfig()
|
let config = buildColprofConfig()
|
||||||
|
|
||||||
isColprofRunning = true
|
|
||||||
colprofLog = []
|
|
||||||
colprofProgress = nil
|
colprofProgress = nil
|
||||||
lastError = nil
|
|
||||||
createdProfileURL = nil
|
createdProfileURL = nil
|
||||||
createdGamutURL = nil
|
createdGamutURL = nil
|
||||||
|
|
||||||
let runner = environment.runner
|
let runner = environment.runner
|
||||||
Task { @MainActor [weak self] in
|
Task { @MainActor [weak self] in
|
||||||
guard let self else { return }
|
guard let self else { return }
|
||||||
defer { self.isColprofRunning = false }
|
|
||||||
|
|
||||||
do {
|
do {
|
||||||
let url = try await runner.runColprof(config: config, onLogBatch: ProcessRunSupport.logSink { [weak self] batch in
|
let outcome = try await ProcessRunSupport.runLogged(
|
||||||
guard let self else { return }
|
setRunning: { self.isColprofRunning = $0 },
|
||||||
self.colprofLog.append(contentsOf: batch)
|
resetLog: { self.colprofLog = [] },
|
||||||
if let last = batch.last {
|
onLog: { batch in
|
||||||
self.updateProgress(ColprofProgressClassifier.classify(line: last))
|
self.colprofLog.append(contentsOf: batch)
|
||||||
|
if let last = batch.last {
|
||||||
|
self.updateProgress(ColprofProgressClassifier.classify(line: last))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
) { onLog in
|
||||||
|
let url = try await runner.runColprof(config: config, onLogBatch: onLog)
|
||||||
|
|
||||||
var finalProfileURL = url
|
var finalProfileURL = url
|
||||||
|
|
||||||
if self.applyCalibration, !self.calibrationFile.isEmpty {
|
if self.applyCalibration, !self.calibrationFile.isEmpty {
|
||||||
let applyConfig = ApplycalConfig(
|
let applyConfig = ApplycalConfig(
|
||||||
calibrationPath: self.calibrationFile,
|
calibrationPath: self.calibrationFile,
|
||||||
inputProfileURL: url
|
inputProfileURL: url
|
||||||
)
|
)
|
||||||
assert(!applyConfig.unapply, "applycal unapply is not supported in v2.0")
|
assert(!applyConfig.unapply, "applycal unapply is not supported in v2.0")
|
||||||
finalProfileURL = try await runner.runApplycal(config: applyConfig)
|
finalProfileURL = try await runner.runApplycal(config: applyConfig)
|
||||||
self.colprofLog.append("Calibration embedded: \(self.calibrationFile)")
|
self.colprofLog.append("Calibration embedded: \(self.calibrationFile)")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gamut extraction is best-effort for Stage 5 / M6 viewer.
|
||||||
|
var gamutURL: URL?
|
||||||
|
do {
|
||||||
|
let gamConfig = IccgamutConfig(profileURL: finalProfileURL)
|
||||||
|
let url = try await runner.runIccgamut(config: gamConfig, onLogBatch: onLog)
|
||||||
|
gamutURL = url
|
||||||
|
self.colprofLog.append("Gamut mesh extracted: \(url.lastPathComponent)")
|
||||||
|
} catch {
|
||||||
|
self.wizard.showNotice(
|
||||||
|
"Gamut extraction skipped: \(error.localizedDescription)",
|
||||||
|
kind: .info
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return (profileURL: finalProfileURL, gamutURL: gamutURL)
|
||||||
}
|
}
|
||||||
|
self.createdProfileURL = outcome.profileURL
|
||||||
// Gamut extraction is best-effort for Stage 5 / M6 viewer.
|
self.createdGamutURL = outcome.gamutURL
|
||||||
do {
|
|
||||||
let gamConfig = IccgamutConfig(profileURL: finalProfileURL)
|
|
||||||
let gamURL = try await runner.runIccgamut(config: gamConfig, onLogBatch: ProcessRunSupport.logSink { [weak self] batch in
|
|
||||||
self?.colprofLog.append(contentsOf: batch)
|
|
||||||
})
|
|
||||||
self.createdGamutURL = gamURL
|
|
||||||
self.colprofLog.append("Gamut mesh extracted: \(gamURL.lastPathComponent)")
|
|
||||||
} catch {
|
|
||||||
self.wizard.showNotice(
|
|
||||||
"Gamut extraction skipped: \(error.localizedDescription)",
|
|
||||||
kind: .info
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
self.createdProfileURL = finalProfileURL
|
|
||||||
self.wizard.refreshGating()
|
self.wizard.refreshGating()
|
||||||
self.wizard.showNotice("Profile created: \(finalProfileURL.lastPathComponent)")
|
self.wizard.showNotice("Profile created: \(outcome.profileURL.lastPathComponent)")
|
||||||
self.wizard.go(to: .verifyInstall)
|
self.wizard.go(to: .verifyInstall)
|
||||||
} catch {
|
} catch {
|
||||||
self.lastError = error.localizedDescription
|
|
||||||
self.wizard.showNotice(
|
self.wizard.showNotice(
|
||||||
"Profile creation failed: \(error.localizedDescription)",
|
"Profile creation failed: \(error.localizedDescription)",
|
||||||
kind: .error
|
kind: .error
|
||||||
@@ -285,23 +283,28 @@ final class ProfileWorkflowViewModel {
|
|||||||
let ti3URL = ArtefactProbe.artefact(wizard.basename, "ti3", cwd)
|
let ti3URL = ArtefactProbe.artefact(wizard.basename, "ti3", cwd)
|
||||||
let config = ProfcheckConfig(ti3URL: ti3URL, iccURL: profileURL)
|
let config = ProfcheckConfig(ti3URL: ti3URL, iccURL: profileURL)
|
||||||
|
|
||||||
isProfcheckRunning = true
|
|
||||||
profcheckReport = nil
|
profcheckReport = nil
|
||||||
profcheckWarning = nil
|
profcheckWarning = nil
|
||||||
|
|
||||||
let runner = environment.runner
|
let runner = environment.runner
|
||||||
Task { @MainActor [weak self] in
|
Task { @MainActor [weak self] in
|
||||||
guard let self else { return }
|
guard let self else { return }
|
||||||
defer { self.isProfcheckRunning = false }
|
|
||||||
|
|
||||||
do {
|
do {
|
||||||
let report = try await runner.runProfcheck(config: config, onLogBatch: ProcessRunSupport.logSink { [weak self] batch in
|
let outcome = try await ProcessRunSupport.runLogged(
|
||||||
self?.colprofLog.append(contentsOf: batch)
|
setRunning: { self.isProfcheckRunning = $0 },
|
||||||
})
|
resetLog: {},
|
||||||
self.profcheckReport = report
|
onLog: { self.colprofLog.append(contentsOf: $0) }
|
||||||
if let record = self.makeVerificationRecord(from: report) {
|
) { onLog in
|
||||||
let updated = try await self.environment.historyStore.append(record)
|
let report = try await runner.runProfcheck(config: config, onLogBatch: onLog)
|
||||||
self.verificationHistory = updated
|
var history: [VerificationRecord]?
|
||||||
|
if let record = self.makeVerificationRecord(from: report) {
|
||||||
|
history = try await self.environment.historyStore.append(record)
|
||||||
|
}
|
||||||
|
return (report: report, history: history)
|
||||||
|
}
|
||||||
|
self.profcheckReport = outcome.report
|
||||||
|
if let history = outcome.history {
|
||||||
|
self.verificationHistory = history
|
||||||
self.driftAlert = DriftAlert.compute(from: self.filteredHistory)
|
self.driftAlert = DriftAlert.compute(from: self.filteredHistory)
|
||||||
}
|
}
|
||||||
} catch let error as ArgyllRunnerError where error == .profcheckUnparseable {
|
} catch let error as ArgyllRunnerError where error == .profcheckUnparseable {
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ final class SettingsViewModel {
|
|||||||
sink.applySettings(settings)
|
sink.applySettings(settings)
|
||||||
savedFlash = true
|
savedFlash = true
|
||||||
Task {
|
Task {
|
||||||
try? await Task.sleep(for: .seconds(1.5))
|
try? await Task.sleep(nanoseconds: 1_500_000_000)
|
||||||
savedFlash = false
|
savedFlash = false
|
||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
|
|||||||
@@ -218,6 +218,7 @@ struct Stage2View: View {
|
|||||||
.foregroundStyle(notice.kind == .error
|
.foregroundStyle(notice.kind == .error
|
||||||
? .red : .blue)
|
? .red : .blue)
|
||||||
.accessibilityIdentifier("printNotificationIcon")
|
.accessibilityIdentifier("printNotificationIcon")
|
||||||
|
.accessibilityValue(notice.kind.accessibilityValue)
|
||||||
Text(notice.text)
|
Text(notice.text)
|
||||||
.font(.caption)
|
.font(.caption)
|
||||||
.foregroundStyle(notice.kind == .error
|
.foregroundStyle(notice.kind == .error
|
||||||
|
|||||||
@@ -164,28 +164,22 @@ struct Stage3View: View {
|
|||||||
.foregroundStyle(Theme.accent)
|
.foregroundStyle(Theme.accent)
|
||||||
}
|
}
|
||||||
|
|
||||||
if let lastError = model.lastError {
|
if let notice = model.chartreadNotice {
|
||||||
Text(lastError)
|
Text(notice.text)
|
||||||
.font(.caption)
|
.font(.caption)
|
||||||
.foregroundStyle(.red)
|
.foregroundStyle(notice.kind.tint)
|
||||||
.accessibilityIdentifier("chartreadLastError")
|
.accessibilityIdentifier("chartreadLastError")
|
||||||
.accessibilityValue(lastError)
|
.accessibilityValue(notice.text)
|
||||||
}
|
}
|
||||||
|
|
||||||
controlButtons
|
controlButtons
|
||||||
|
|
||||||
if !model.chartreadLog.isEmpty {
|
if !model.chartreadLog.isEmpty {
|
||||||
DisclosureGroup("Log") {
|
ProcessLogView(
|
||||||
VStack(alignment: .leading) {
|
lines: model.chartreadLog,
|
||||||
ForEach(model.chartreadLog, id: \.self) { line in
|
containerId: "chartreadLogContainer",
|
||||||
Text(line)
|
logId: "chartreadLog"
|
||||||
.font(.system(.caption, design: .monospaced))
|
)
|
||||||
.foregroundStyle(.secondary)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.foregroundStyle(Theme.text)
|
|
||||||
.accessibilityIdentifier("chartreadLogContainer")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.padding(16)
|
.padding(16)
|
||||||
@@ -374,6 +368,8 @@ struct Stage3View: View {
|
|||||||
Text(notice.text)
|
Text(notice.text)
|
||||||
.font(.caption)
|
.font(.caption)
|
||||||
.foregroundStyle(notice.kind == .error ? .red : .green)
|
.foregroundStyle(notice.kind == .error ? .red : .green)
|
||||||
|
.accessibilityIdentifier("chartreadFinishNotice")
|
||||||
|
.accessibilityValue(notice.kind.accessibilityValue)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.padding(16)
|
.padding(16)
|
||||||
|
|||||||
@@ -166,27 +166,14 @@ struct Stage4View: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Spacer()
|
Spacer()
|
||||||
|
|
||||||
if let lastError = model.lastError {
|
|
||||||
Text(lastError)
|
|
||||||
.font(.caption)
|
|
||||||
.foregroundStyle(.red)
|
|
||||||
.accessibilityIdentifier("colprofLastError")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if !model.colprofLog.isEmpty {
|
if !model.colprofLog.isEmpty {
|
||||||
DisclosureGroup("Log") {
|
ProcessLogView(
|
||||||
VStack(alignment: .leading) {
|
lines: model.colprofLog,
|
||||||
ForEach(model.colprofLog, id: \.self) { line in
|
containerId: "colprofLogContainer",
|
||||||
Text(line)
|
logId: "colprofLog"
|
||||||
.font(.system(.caption, design: .monospaced))
|
)
|
||||||
.foregroundStyle(.secondary)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.foregroundStyle(Theme.text)
|
|
||||||
.accessibilityIdentifier("colprofLogContainer")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.padding(16)
|
.padding(16)
|
||||||
|
|||||||
@@ -206,8 +206,6 @@ final class TargetWorkflowViewModel {
|
|||||||
func generateTarget() {
|
func generateTarget() {
|
||||||
guard canGenerate, !targenRunning else { return }
|
guard canGenerate, !targenRunning else { return }
|
||||||
let config = buildTargenConfig()
|
let config = buildTargenConfig()
|
||||||
targenRunning = true
|
|
||||||
targenLog = []
|
|
||||||
resumedFromTi2 = false
|
resumedFromTi2 = false
|
||||||
let runner = environment.runner
|
let runner = environment.runner
|
||||||
Task { @MainActor in
|
Task { @MainActor in
|
||||||
@@ -228,7 +226,6 @@ final class TargetWorkflowViewModel {
|
|||||||
} catch {
|
} catch {
|
||||||
wizard.showNotice(
|
wizard.showNotice(
|
||||||
"targen failed: \(error.localizedDescription)", kind: .error)
|
"targen failed: \(error.localizedDescription)", kind: .error)
|
||||||
targenRunning = false
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -242,7 +239,12 @@ final class TargetWorkflowViewModel {
|
|||||||
? UITestHooks.datasetImportURL
|
? UITestHooks.datasetImportURL
|
||||||
: fileDialogs.selectDatasetFile()
|
: fileDialogs.selectDatasetFile()
|
||||||
guard let url else { return }
|
guard let url else { return }
|
||||||
|
importMeasurementDataset(from: url)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Test seam (issue #80): unit tests pass missing or malformed URLs
|
||||||
|
/// directly instead of mutating the global environment.
|
||||||
|
func importMeasurementDataset(from url: URL) {
|
||||||
do {
|
do {
|
||||||
let dataset = try CGATSParser.parse(url: url)
|
let dataset = try CGATSParser.parse(url: url)
|
||||||
guard let directory = targetDirectory ?? wizard.effectiveWorkingDirectory else {
|
guard let directory = targetDirectory ?? wizard.effectiveWorkingDirectory else {
|
||||||
@@ -339,8 +341,6 @@ final class TargetWorkflowViewModel {
|
|||||||
func createLayout() {
|
func createLayout() {
|
||||||
guard wizard.isUnlocked(.layOutPrint), !printtargRunning else { return }
|
guard wizard.isUnlocked(.layOutPrint), !printtargRunning else { return }
|
||||||
let config = buildPrinttargConfig()
|
let config = buildPrinttargConfig()
|
||||||
printtargRunning = true
|
|
||||||
printtargLog = []
|
|
||||||
printtargResult = nil
|
printtargResult = nil
|
||||||
let runner = environment.runner
|
let runner = environment.runner
|
||||||
Task { @MainActor in
|
Task { @MainActor in
|
||||||
|
|||||||
@@ -201,7 +201,7 @@ final class WizardViewModel {
|
|||||||
self.notice = notice
|
self.notice = notice
|
||||||
if let delay = notice.autoHideAfter {
|
if let delay = notice.autoHideAfter {
|
||||||
noticeDismissTask = Task { [weak self] in
|
noticeDismissTask = Task { [weak self] in
|
||||||
try? await Task.sleep(for: .seconds(delay))
|
try? await Task.sleep(nanoseconds: UInt64(delay * 1_000_000_000))
|
||||||
guard !Task.isCancelled else { return }
|
guard !Task.isCancelled else { return }
|
||||||
if self?.notice?.id == notice.id {
|
if self?.notice?.id == notice.id {
|
||||||
self?.notice = nil
|
self?.notice = nil
|
||||||
|
|||||||
@@ -0,0 +1,67 @@
|
|||||||
|
import Foundation
|
||||||
|
import Testing
|
||||||
|
@testable import ICCery
|
||||||
|
|
||||||
|
/// Direct contracts for the shared logged-run helper (issue #80).
|
||||||
|
///
|
||||||
|
/// `runLogged` owns the running-flag transition (`false → true → false`)
|
||||||
|
/// and the log-reset decision; these tests pin both sides of the
|
||||||
|
/// contract plus the coalesced `@MainActor` log hop.
|
||||||
|
@Suite("ProcessRunSupport runLogged")
|
||||||
|
@MainActor
|
||||||
|
struct ProcessRunSupportTests {
|
||||||
|
|
||||||
|
private struct SentinelError: Error {}
|
||||||
|
|
||||||
|
@Test("Success: running transitions [true, false], log resets once, batches reach the main actor, value preserved")
|
||||||
|
func successTransitions() async throws {
|
||||||
|
var running: [Bool] = []
|
||||||
|
var resets = 0
|
||||||
|
var received: [String] = []
|
||||||
|
|
||||||
|
let result = try await ProcessRunSupport.runLogged(
|
||||||
|
setRunning: { running.append($0) },
|
||||||
|
resetLog: { resets += 1 },
|
||||||
|
onLog: { batch in
|
||||||
|
MainActor.assertIsolated()
|
||||||
|
received.append(contentsOf: batch)
|
||||||
|
}
|
||||||
|
) { onLog in
|
||||||
|
onLog(["alpha", "beta"])
|
||||||
|
return 42
|
||||||
|
}
|
||||||
|
|
||||||
|
#expect(result == 42)
|
||||||
|
#expect(running == [true, false])
|
||||||
|
#expect(resets == 1)
|
||||||
|
|
||||||
|
// The sink hops back through a main-actor Task; yield until the
|
||||||
|
// coalesced batch lands.
|
||||||
|
for _ in 0..<200 where received.isEmpty {
|
||||||
|
try await Task.sleep(for: .milliseconds(10))
|
||||||
|
}
|
||||||
|
#expect(received == ["alpha", "beta"])
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test("Failure: running still transitions [true, false], log resets once, error is rethrown")
|
||||||
|
func failureTransitions() async throws {
|
||||||
|
var running: [Bool] = []
|
||||||
|
var resets = 0
|
||||||
|
|
||||||
|
do {
|
||||||
|
_ = try await ProcessRunSupport.runLogged(
|
||||||
|
setRunning: { running.append($0) },
|
||||||
|
resetLog: { resets += 1 },
|
||||||
|
onLog: { _ in }
|
||||||
|
) { _ -> Int in
|
||||||
|
throw SentinelError()
|
||||||
|
}
|
||||||
|
Issue.record("Expected runLogged to rethrow")
|
||||||
|
} catch is SentinelError {
|
||||||
|
// Expected path.
|
||||||
|
}
|
||||||
|
|
||||||
|
#expect(running == [true, false])
|
||||||
|
#expect(resets == 1)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
import Foundation
|
||||||
|
import Testing
|
||||||
|
@testable import ICCeryCore
|
||||||
|
@testable import ICCery
|
||||||
|
|
||||||
|
/// Dataset-import error contracts through the
|
||||||
|
/// `importMeasurementDataset(from:)` seam (issue #80): parser and I/O
|
||||||
|
/// failures must surface identically as a single `.error` Notice.
|
||||||
|
@Suite("TargetWorkflowViewModel dataset import")
|
||||||
|
@MainActor
|
||||||
|
struct TargetWorkflowViewModelTests {
|
||||||
|
|
||||||
|
@Test("Malformed content (CGATSParseError) produces one .error notice prefixed 'Import failed:'")
|
||||||
|
func malformedDatasetNotice() throws {
|
||||||
|
let env = try TestAppEnvironment.make()
|
||||||
|
defer { env.cleanup() }
|
||||||
|
let vm = TargetWorkflowViewModel(environment: env.environment)
|
||||||
|
|
||||||
|
let bad = env.root.appendingPathComponent("broken.ti3")
|
||||||
|
try Data("this is not CGATS data".utf8).write(to: bad)
|
||||||
|
|
||||||
|
vm.importMeasurementDataset(from: bad)
|
||||||
|
|
||||||
|
let notice = try #require(vm.wizard.notice)
|
||||||
|
#expect(notice.kind == .error)
|
||||||
|
#expect(notice.text.hasPrefix("Import failed:"))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test("Missing file (CocoaError) produces one .error notice prefixed 'Import failed:'")
|
||||||
|
func missingDatasetNotice() throws {
|
||||||
|
let env = try TestAppEnvironment.make()
|
||||||
|
defer { env.cleanup() }
|
||||||
|
let vm = TargetWorkflowViewModel(environment: env.environment)
|
||||||
|
|
||||||
|
let missing = env.root.appendingPathComponent("does-not-exist.ti3")
|
||||||
|
vm.importMeasurementDataset(from: missing)
|
||||||
|
|
||||||
|
let notice = try #require(vm.wizard.notice)
|
||||||
|
#expect(notice.kind == .error)
|
||||||
|
#expect(notice.text.hasPrefix("Import failed:"))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -133,6 +133,18 @@ final class Milestone2UITests: XCTestCase {
|
|||||||
XCTAssertTrue(element("targenInkLimitGroup").waitForExistence(timeout: 5))
|
XCTAssertTrue(element("targenInkLimitGroup").waitForExistence(timeout: 5))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Stage 1/2 process-log containers resolve under the shared
|
||||||
|
/// `ProcessLogView` identifiers (issue #80).
|
||||||
|
func testProcessLogContainersResolve() throws {
|
||||||
|
launchApp()
|
||||||
|
XCTAssertTrue(waitFor("targenLogContainer").exists)
|
||||||
|
|
||||||
|
app.buttons["btnBrowse"].click()
|
||||||
|
app.buttons["btnGenerate"].click()
|
||||||
|
XCTAssertTrue(waitFor("btnCreateLayout", timeout: 20).exists)
|
||||||
|
XCTAssertTrue(element("printtargLogContainer").exists)
|
||||||
|
}
|
||||||
|
|
||||||
/// Fixture-backed targen run creates .ti1 and unlocks Stage 2.
|
/// Fixture-backed targen run creates .ti1 and unlocks Stage 2.
|
||||||
func testTargenFixtureUnlocksStage2() throws {
|
func testTargenFixtureUnlocksStage2() throws {
|
||||||
launchApp()
|
launchApp()
|
||||||
|
|||||||
@@ -146,6 +146,8 @@ final class Milestone3UITests: XCTestCase {
|
|||||||
XCTAssertTrue(notice.waitForExistence(timeout: 10))
|
XCTAssertTrue(notice.waitForExistence(timeout: 10))
|
||||||
XCTAssertTrue((notice.value as? String ?? "")
|
XCTAssertTrue((notice.value as? String ?? "")
|
||||||
.contains("cancelled"))
|
.contains("cancelled"))
|
||||||
|
// Cancellation is informational, never an error (#80).
|
||||||
|
XCTAssertEqual(element("printNotificationIcon").value as? String, "info")
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Preferences OK → captured options are replayed verbatim in the
|
/// Preferences OK → captured options are replayed verbatim in the
|
||||||
@@ -214,6 +216,8 @@ final class Milestone3UITests: XCTestCase {
|
|||||||
let notice = app.staticTexts.containing(predicate).firstMatch
|
let notice = app.staticTexts.containing(predicate).firstMatch
|
||||||
XCTAssertTrue(notice.waitForExistence(timeout: 10))
|
XCTAssertTrue(notice.waitForExistence(timeout: 10))
|
||||||
XCTAssertTrue(notice.label.contains("Print failed"))
|
XCTAssertTrue(notice.label.contains("Print failed"))
|
||||||
|
// Spool failure exposes the .error kind on the icon (#80).
|
||||||
|
XCTAssertEqual(element("printNotificationIcon").value as? String, "error")
|
||||||
}
|
}
|
||||||
|
|
||||||
/// wizardState.printerName records the queue used for spooling (#95).
|
/// wizardState.printerName records the queue used for spooling (#95).
|
||||||
|
|||||||
@@ -140,4 +140,57 @@ final class Milestone4UITests: XCTestCase {
|
|||||||
}
|
}
|
||||||
XCTAssertTrue(FileManager.default.fileExists(atPath: ti3.path))
|
XCTAssertTrue(FileManager.default.fileExists(atPath: ti3.path))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Two passes + a failing `average` run promote pass 1 to the
|
||||||
|
/// canonical .ti3 and show the sticky finish error notice via
|
||||||
|
/// `chartreadFinishNotice` (issue #80).
|
||||||
|
func testTwoPassAverageFailurePromotesFirstPass() throws {
|
||||||
|
app.launchEnvironment["MOCK_AVERAGE_FAIL"] = "1"
|
||||||
|
reachStage3()
|
||||||
|
|
||||||
|
app.buttons["btnDetectInstruments"].click()
|
||||||
|
_ = waitFor("chartreadInstrumentSelect", timeout: 20)
|
||||||
|
|
||||||
|
driveOnePass(startButton: "btnStartRead")
|
||||||
|
_ = waitFor("chartreadAveragingPanel", timeout: 20)
|
||||||
|
|
||||||
|
driveOnePass(startButton: "btnMeasureAnotherSheet")
|
||||||
|
|
||||||
|
XCTAssertTrue(waitFor("btnFinishAndAverage", timeout: 20).exists)
|
||||||
|
app.buttons["btnFinishAndAverage"].click()
|
||||||
|
|
||||||
|
// Averaging failed → pass 1 is promoted to the canonical .ti3
|
||||||
|
// and the sticky error notice stays on Stage 3.
|
||||||
|
let ti3 = workDir.appendingPathComponent("mytarget.ti3")
|
||||||
|
let deadline = Date().addingTimeInterval(20)
|
||||||
|
while Date() < deadline, !FileManager.default.fileExists(atPath: ti3.path) {
|
||||||
|
RunLoop.current.run(until: Date().addingTimeInterval(0.2))
|
||||||
|
}
|
||||||
|
XCTAssertTrue(FileManager.default.fileExists(atPath: ti3.path))
|
||||||
|
|
||||||
|
let notice = element("chartreadFinishNotice")
|
||||||
|
XCTAssertTrue(notice.waitForExistence(timeout: 10))
|
||||||
|
XCTAssertEqual(notice.value as? String, "error")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Runs the mock handheld chartread session to completion
|
||||||
|
/// (start → calibrate → strip A → strip B → Done & Save).
|
||||||
|
private func driveOnePass(startButton: String) {
|
||||||
|
let start = app.buttons[startButton]
|
||||||
|
XCTAssertTrue(start.waitForExistence(timeout: 10))
|
||||||
|
let deadline = Date().addingTimeInterval(10)
|
||||||
|
while Date() < deadline, !start.isEnabled {
|
||||||
|
RunLoop.current.run(until: Date().addingTimeInterval(0.1))
|
||||||
|
}
|
||||||
|
XCTAssertTrue(start.isEnabled)
|
||||||
|
start.click()
|
||||||
|
_ = waitFor("btnCalibrate", timeout: 25)
|
||||||
|
app.buttons["btnCalibrate"].click()
|
||||||
|
_ = waitFor("btnTrigger", timeout: 20)
|
||||||
|
app.buttons["btnTrigger"].click()
|
||||||
|
_ = waitFor("btnTrigger", timeout: 20)
|
||||||
|
app.buttons["btnTrigger"].click()
|
||||||
|
_ = waitFor("btnDoneRead", timeout: 20)
|
||||||
|
app.buttons["btnDoneRead"].firstMatch.click()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -111,4 +111,21 @@ final class Milestone5UITests: XCTestCase {
|
|||||||
"Expected verification status, got '\(statusValue)'"
|
"Expected verification status, got '\(statusValue)'"
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A failing colprof run surfaces through the session-wide wizard
|
||||||
|
/// notice only — no duplicate stage-local error view (issue #80).
|
||||||
|
func testProfileFailureShowsWizardNotice() throws {
|
||||||
|
app.launchEnvironment["ICCERY_MOCK_COLPROF_EXIT"] = "2"
|
||||||
|
launchApp()
|
||||||
|
|
||||||
|
let create = waitFor("btnCreateProfile")
|
||||||
|
XCTAssertTrue(create.isEnabled)
|
||||||
|
create.click()
|
||||||
|
|
||||||
|
let notice = element("noticeText")
|
||||||
|
XCTAssertTrue(notice.waitForExistence(timeout: 20))
|
||||||
|
XCTAssertTrue((notice.value as? String ?? "")
|
||||||
|
.contains("Profile creation failed"))
|
||||||
|
XCTAssertFalse(element("colprofLastError").exists)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ final class Milestone6CalibrationUITests: XCTestCase {
|
|||||||
"ICCERY_TEST_WORKDIR": testWorkDir.path
|
"ICCERY_TEST_WORKDIR": testWorkDir.path
|
||||||
]
|
]
|
||||||
app.launch()
|
app.launch()
|
||||||
|
app.activate()
|
||||||
}
|
}
|
||||||
|
|
||||||
override func tearDown() async throws {
|
override func tearDown() async throws {
|
||||||
@@ -77,4 +78,60 @@ final class Milestone6CalibrationUITests: XCTestCase {
|
|||||||
let layout = app.buttons["btnCreateLayout"]
|
let layout = app.buttons["btnCreateLayout"]
|
||||||
XCTAssertTrue(layout.waitForExistence(timeout: 25))
|
XCTAssertTrue(layout.waitForExistence(timeout: 25))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A failing calibration targen surfaces the error through the
|
||||||
|
/// wizard notice and restores the original basename (issue #80).
|
||||||
|
func testCalibrationTargenFailureRestoresBasename() throws {
|
||||||
|
let testRoot = FileManager.default.temporaryDirectory
|
||||||
|
.appendingPathComponent("cal-fail-\(UUID().uuidString)")
|
||||||
|
let appData = testRoot.appendingPathComponent("AppData")
|
||||||
|
try FileManager.default.createDirectory(
|
||||||
|
at: appData, withIntermediateDirectories: true)
|
||||||
|
defer { try? FileManager.default.removeItem(at: testRoot) }
|
||||||
|
|
||||||
|
// Pre-stage wizard state so the failing mock targen is only
|
||||||
|
// exercised by the calibration run, not target generation.
|
||||||
|
let state: [String: Any] = [
|
||||||
|
"currentStage": 1,
|
||||||
|
"basename": "DemoTarget",
|
||||||
|
"cwd": testWorkDir.path,
|
||||||
|
"sessionMode": "profile",
|
||||||
|
"calibrationOriginalBasename": ""
|
||||||
|
]
|
||||||
|
let stateURL = appData.appendingPathComponent("wizard_state.json")
|
||||||
|
try JSONSerialization.data(withJSONObject: state).write(to: stateURL)
|
||||||
|
|
||||||
|
app.terminate()
|
||||||
|
app.launchEnvironment["ICCERY_TEST_ROOT"] = testRoot.path
|
||||||
|
app.launchEnvironment["ICCERY_MOCK_TARGEN_EXIT"] = "2"
|
||||||
|
app.launch()
|
||||||
|
app.activate()
|
||||||
|
|
||||||
|
let calButton = app.buttons["btnCalibratePrinter"]
|
||||||
|
XCTAssertTrue(calButton.waitForExistence(timeout: 10))
|
||||||
|
calButton.tap()
|
||||||
|
|
||||||
|
let calGenerate = app.buttons["btnCalGenerate"]
|
||||||
|
XCTAssertTrue(calGenerate.waitForExistence(timeout: 10))
|
||||||
|
calGenerate.tap()
|
||||||
|
|
||||||
|
let notice = app.descendants(matching: .any)["noticeText"]
|
||||||
|
XCTAssertTrue(notice.waitForExistence(timeout: 20))
|
||||||
|
XCTAssertTrue((notice.value as? String ?? "")
|
||||||
|
.contains("Calibration target failed"))
|
||||||
|
|
||||||
|
// The pre-CAL_ basename is restored and persisted.
|
||||||
|
let deadline = Date().addingTimeInterval(10)
|
||||||
|
var restoredBasename: String?
|
||||||
|
while Date() < deadline {
|
||||||
|
if let data = try? Data(contentsOf: stateURL),
|
||||||
|
let object = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
|
||||||
|
let basename = object["basename"] as? String {
|
||||||
|
restoredBasename = basename
|
||||||
|
if basename == "DemoTarget" { break }
|
||||||
|
}
|
||||||
|
RunLoop.current.run(until: Date().addingTimeInterval(0.1))
|
||||||
|
}
|
||||||
|
XCTAssertEqual(restoredBasename, "DemoTarget")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+12
-12
@@ -2,7 +2,7 @@ name: ICCery
|
|||||||
options:
|
options:
|
||||||
bundleIdPrefix: com.gronod
|
bundleIdPrefix: com.gronod
|
||||||
deploymentTarget:
|
deploymentTarget:
|
||||||
macOS: "14.0"
|
macOS: "12.0"
|
||||||
groupSortPosition: top
|
groupSortPosition: top
|
||||||
|
|
||||||
packages:
|
packages:
|
||||||
@@ -13,7 +13,7 @@ targets:
|
|||||||
ICCery:
|
ICCery:
|
||||||
type: application
|
type: application
|
||||||
platform: macOS
|
platform: macOS
|
||||||
deploymentTarget: "14.0"
|
deploymentTarget: "12.0"
|
||||||
sources:
|
sources:
|
||||||
- path: Sources/ICCery
|
- path: Sources/ICCery
|
||||||
- path: Resources
|
- path: Resources
|
||||||
@@ -46,7 +46,7 @@ targets:
|
|||||||
PRODUCT_BUNDLE_PACKAGE_TYPE: APPL
|
PRODUCT_BUNDLE_PACKAGE_TYPE: APPL
|
||||||
GENERATE_INFOPLIST_FILE: YES
|
GENERATE_INFOPLIST_FILE: YES
|
||||||
INFOPLIST_KEY_CFBundleDisplayName: ICCery
|
INFOPLIST_KEY_CFBundleDisplayName: ICCery
|
||||||
INFOPLIST_KEY_LSMinimumSystemVersion: "14.0"
|
INFOPLIST_KEY_LSMinimumSystemVersion: "12.0"
|
||||||
INFOPLIST_KEY_NSPrincipalClass: NSApplication
|
INFOPLIST_KEY_NSPrincipalClass: NSApplication
|
||||||
INFOPLIST_KEY_NSHumanReadableCopyright: "Copyright © 2026 Gronod. AGPLv3."
|
INFOPLIST_KEY_NSHumanReadableCopyright: "Copyright © 2026 Gronod. AGPLv3."
|
||||||
MARKETING_VERSION: "2.0.0"
|
MARKETING_VERSION: "2.0.0"
|
||||||
@@ -58,15 +58,15 @@ targets:
|
|||||||
ENABLE_APP_SANDBOX: NO
|
ENABLE_APP_SANDBOX: NO
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon
|
ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon
|
||||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME: AccentColor
|
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME: AccentColor
|
||||||
SWIFT_VERSION: "6.0"
|
SWIFT_VERSION: "5.0"
|
||||||
SWIFT_STRICT_CONCURRENCY: complete
|
OTHER_SWIFT_FLAGS: ["$(inherited)", "-strict-concurrency=minimal"]
|
||||||
MACOSX_DEPLOYMENT_TARGET: "14.0"
|
MACOSX_DEPLOYMENT_TARGET: "12.0"
|
||||||
ARCHS: "$(ARCHS_STANDARD)"
|
ARCHS: "$(ARCHS_STANDARD)"
|
||||||
|
|
||||||
ICCeryCoreTests:
|
ICCeryCoreTests:
|
||||||
type: bundle.unit-test
|
type: bundle.unit-test
|
||||||
platform: macOS
|
platform: macOS
|
||||||
deploymentTarget: "14.0"
|
deploymentTarget: "12.0"
|
||||||
sources:
|
sources:
|
||||||
- path: Tests/ICCeryCoreTests
|
- path: Tests/ICCeryCoreTests
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -79,13 +79,13 @@ targets:
|
|||||||
TEST_HOST: "$(BUILT_PRODUCTS_DIR)/ICCery.app/Contents/MacOS/ICCery"
|
TEST_HOST: "$(BUILT_PRODUCTS_DIR)/ICCery.app/Contents/MacOS/ICCery"
|
||||||
GENERATE_INFOPLIST_FILE: YES
|
GENERATE_INFOPLIST_FILE: YES
|
||||||
CODE_SIGN_IDENTITY: "-"
|
CODE_SIGN_IDENTITY: "-"
|
||||||
SWIFT_VERSION: "6.0"
|
SWIFT_VERSION: "5.0"
|
||||||
MACOSX_DEPLOYMENT_TARGET: "14.0"
|
MACOSX_DEPLOYMENT_TARGET: "12.0"
|
||||||
|
|
||||||
ICCeryUITests:
|
ICCeryUITests:
|
||||||
type: bundle.ui-testing
|
type: bundle.ui-testing
|
||||||
platform: macOS
|
platform: macOS
|
||||||
deploymentTarget: "14.0"
|
deploymentTarget: "12.0"
|
||||||
sources:
|
sources:
|
||||||
- path: Tests/ICCeryUITests
|
- path: Tests/ICCeryUITests
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -95,8 +95,8 @@ targets:
|
|||||||
TEST_TARGET_NAME: ICCery
|
TEST_TARGET_NAME: ICCery
|
||||||
GENERATE_INFOPLIST_FILE: YES
|
GENERATE_INFOPLIST_FILE: YES
|
||||||
CODE_SIGN_IDENTITY: "-"
|
CODE_SIGN_IDENTITY: "-"
|
||||||
SWIFT_VERSION: "6.0"
|
SWIFT_VERSION: "5.0"
|
||||||
MACOSX_DEPLOYMENT_TARGET: "14.0"
|
MACOSX_DEPLOYMENT_TARGET: "12.0"
|
||||||
|
|
||||||
schemes:
|
schemes:
|
||||||
ICCery:
|
ICCery:
|
||||||
|
|||||||
Reference in New Issue
Block a user