Skip to content

Play your own Switch games on iPhone/iPad — one-click macOS app, no terminal. | 把 Switch 游戏装进 iPhone:图形界面一键构建,不用命令行。Bring your own game.

Let the Choose dialog pick NSZ and XCZ files

v0lumehi8f92dbd5ea87
diff --git a/frontend/Sources/NSPortBuilder/ContentView.swift b/frontend/Sources/NSPortBuilder/ContentView.swift
index 5d76c0b3..1c6a23ac 100644
--- a/frontend/Sources/NSPortBuilder/ContentView.swift
+++ b/frontend/Sources/NSPortBuilder/ContentView.swift
@@ -994,16 +994,22 @@ final class BuildModel: ObservableObject {
return v
}
+ /// What the Choose… dialog of a row offers. The compressed NSZ / XCZ are accepted by the build
+ /// script like their plain forms. DLC ships as NSP (or NSZ), never as a cartridge image.
+ nonisolated static func allowedFileTypes(for kind: InputKind) -> [String] {
+ switch kind {
+ case .base, .update: return ["nsp", "xci", "nsz", "xcz"]
+ case .dlc: return ["nsp", "nsz"]
+ case .keys: return ["keys"]
+ }
+ }
+
func pickFiles(kind: InputKind) {
let p = NSOpenPanel()
p.canChooseDirectories = false
p.canChooseFiles = true
p.allowsMultipleSelection = (kind == .dlc)
- switch kind {
- case .base, .update: p.allowedFileTypes = ["nsp", "xci"]
- case .dlc: p.allowedFileTypes = ["nsp"]
- case .keys: p.allowedFileTypes = ["keys"]
- }
+ p.allowedFileTypes = Self.allowedFileTypes(for: kind)
guard p.runModal() == .OK, !p.urls.isEmpty else { return }
let id = kind == .base ? "base" : kind == .update ? "update" : kind == .dlc ? "dlc" : "keys"
let picked = p.urls.map(\.path)
diff --git a/frontend/Tests/NSPortBuilderTests/DropFilesTests.swift b/frontend/Tests/NSPortBuilderTests/DropFilesTests.swift
index d019cf97..9b10e6aa 100644
--- a/frontend/Tests/NSPortBuilderTests/DropFilesTests.swift
+++ b/frontend/Tests/NSPortBuilderTests/DropFilesTests.swift
@@ -22,6 +22,14 @@ final class DropFilesTests: XCTestCase {
return path
}
+ /// The per-row Choose… dialog must not grey out compressed dumps (issue #236).
+ func testChooseDialogOffersCompressedDumps() {
+ XCTAssertEqual(Set(BuildModel.allowedFileTypes(for: .base)), ["nsp", "xci", "nsz", "xcz"])
+ XCTAssertEqual(BuildModel.allowedFileTypes(for: .update), BuildModel.allowedFileTypes(for: .base))
+ XCTAssertEqual(Set(BuildModel.allowedFileTypes(for: .dlc)), ["nsp", "nsz"])
+ XCTAssertEqual(BuildModel.allowedFileTypes(for: .keys), ["keys"])
+ }
+
func testADroppedMixedSetIsSortedByTitleID() throws {
let base = try file("Game [0100000000010000][v0].nsp", size: 64)
let repack = try file("Game [0100000000010000].nsz", size: 32)