Free fork of NotProton: Windows Steam games in Mac Steam, on CodeWeavers' Wine and Apple's Game Porting Toolkit
Swift apple-silicond3dmetaldxmtdxvkgame-porting-toolkitgptkmac-gamingmacosmetalfxrosetta-2steamsteam-playwinewinecx
Report every unpatched CrossOver build, not just the first
NotProtonNot416115fba42f
diff --git a/app/Sources/NotProtonApp/Model/CrossOverRow.swift b/app/Sources/NotProtonApp/Model/CrossOverRow.swiftindex 8bf6563..ac44c17 100644--- a/app/Sources/NotProtonApp/Model/CrossOverRow.swift+++ b/app/Sources/NotProtonApp/Model/CrossOverRow.swift@@ -40,13 +40,13 @@ struct CrossOverRow: Identifiable, Equatable {installed: [RunnerBuild],damaged: [String],orphaned: [String],- unpatched: String?+ unpatched: [String]) -> [CrossOverRow] {var rows: [CrossOverRow] = []var seen: Set<String> = []func copy(of build: String) -> Copy {- if build == unpatched { return .unpatched }+ if unpatched.contains(build) { return .unpatched }if installed.contains(where: { $0.id == build }) { return .ready }if damaged.contains(build) { return .damaged }return .nonediff --git a/app/Sources/NotProtonApp/Model/RunnerStore.swift b/app/Sources/NotProtonApp/Model/RunnerStore.swiftindex e9c60e3..48a2ef4 100644--- a/app/Sources/NotProtonApp/Model/RunnerStore.swift+++ b/app/Sources/NotProtonApp/Model/RunnerStore.swift@@ -5,13 +5,13 @@ import Foundationenum RunnerState: Sendable, Equatable {case nonecase ready(builds: [String])- case unpatched(build: String, problems: [String])+ case unpatched(builds: [String], problems: [String])var builds: [String] {switch self {case .none: []case .ready(let builds): builds- case .unpatched(let build, _): [build]+ case .unpatched(let builds, _): builds}}}@@ -27,11 +27,16 @@ enum RunnerStore {let installed = installedBuilds(in: runners)guard !installed.isEmpty else { return .none }+ var unpatched: [String] = []+ var problems: [String] = []for build in installed {- let problems = verify(build, SupportPaths.clonedRoot(forBuild: build.id, runners: runners))- if !problems.isEmpty { return .unpatched(build: build.id, problems: problems) }+ let found = verify(build, SupportPaths.clonedRoot(forBuild: build.id, runners: runners))+ guard !found.isEmpty else { continue }+ unpatched.append(build.id)+ problems += found.map { "\(build.id): \($0)" }}- return .ready(builds: installed.map(\.id))+ if unpatched.isEmpty { return .ready(builds: installed.map(\.id)) }+ return .unpatched(builds: unpatched, problems: problems)}static func clonedBuilds(in runners: URL = SupportPaths.runners) -> [String] {diff --git a/app/Sources/NotProtonApp/Support/AppLog.swift b/app/Sources/NotProtonApp/Support/AppLog.swiftindex cc378f9..fe4c4e6 100644--- a/app/Sources/NotProtonApp/Support/AppLog.swift+++ b/app/Sources/NotProtonApp/Support/AppLog.swift@@ -76,8 +76,8 @@ enum AppLog {switch runner {case .none: "not set up"case .ready(let builds): "ready \(builds.joined(separator: ", "))"- case .unpatched(let build, let problems):- "cloned \(build) unpatched: \(problems.joined(separator: ", "))"+ case .unpatched(_, let problems):+ "unpatched: \(problems.joined(separator: ", "))"}}diff --git a/app/Sources/NotProtonApp/SystemStatus.swift b/app/Sources/NotProtonApp/SystemStatus.swiftindex 13c2b12..6a37705 100644--- a/app/Sources/NotProtonApp/SystemStatus.swift+++ b/app/Sources/NotProtonApp/SystemStatus.swift@@ -134,8 +134,8 @@ final class SystemStatus {var crossOverRows: [CrossOverRow] {guard let snapshot else { return [] }- var unpatched: String?- if case .unpatched(let build, _) = snapshot.runner { unpatched = build }+ var unpatched: [String] = []+ if case .unpatched(let builds, _) = snapshot.runner { unpatched = builds }return CrossOverRow.rows(installs: snapshot.crossOver,licenses: snapshot.crossOverLicense,diff --git a/app/Tests/NotProtonAppTests/CrossOverRowTests.swift b/app/Tests/NotProtonAppTests/CrossOverRowTests.swiftindex 8c1f4a4..1535c59 100644--- a/app/Tests/NotProtonAppTests/CrossOverRowTests.swift+++ b/app/Tests/NotProtonAppTests/CrossOverRowTests.swift@@ -18,7 +18,7 @@ struct CrossOverRowTests {installed: [RunnerBuild] = [],damaged: [String] = [],orphaned: [String] = [],- unpatched: String? = nil,+ unpatched: [String] = [],unlicensed: Set<String> = []) -> [CrossOverRow] {var licenses: [String: CrossOverLicense.Status] = [:]@@ -75,7 +75,7 @@ struct CrossOverRowTests {let made = rows([preview, release], installed: [Self.preview], damaged: [Self.release.id],- orphaned: ["25.0.0.1"], unpatched: Self.preview.id+ orphaned: ["25.0.0.1"], unpatched: [Self.preview.id])#expect(made.map(\.copy) == [.unpatched, .damaged, .unsupported])diff --git a/app/Tests/NotProtonAppTests/RunnerStateTests.swift b/app/Tests/NotProtonAppTests/RunnerStateTests.swiftindex 71f2ab6..dcdf89a 100644--- a/app/Tests/NotProtonAppTests/RunnerStateTests.swift+++ b/app/Tests/NotProtonAppTests/RunnerStateTests.swift@@ -49,7 +49,19 @@ struct RunnerStateTests {try fixture.makeClone(build: version)#expect(RunnerStore.state(runners: fixture.runners, verify: { _, _ in ["ntdll is stock"] })- == .unpatched(build: version, problems: ["ntdll is stock"]))+ == .unpatched(builds: [version], problems: ["\(version): ntdll is stock"]))+ }++ @Test("Every unpatched clone is reported, not just the first")+ func reportsEveryUnpatchedClone() throws {+ let fixture = try Fixture()+ let ids = SupportedRunners.all.prefix(3).map(\.id).sorted()+ for id in ids { try fixture.makeClone(build: id) }+ let stock = Set(ids.dropFirst())++ #expect(RunnerStore.state(runners: fixture.runners, verify: { build, _ in+ stock.contains(build.id) ? ["ntdll is stock"] : []+ }) == .unpatched(builds: Array(ids.dropFirst()), problems: ids.dropFirst().map { "\($0): ntdll is stock" }))}@Test("A clone outside the allow list is orphaned, not ready")