Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ let package = Package(
],
path: "Sources/FluidAudio",
resources: [
.copy("TTS/LuxTts/G2p/Resources")
// Keep .process: .copy of a Resources-named directory breaks Apple code signing on iOS.
.process("TTS/LuxTts/G2p/Resources")
]
),
// Byte-exact NeMo text normalization (FST engine, all 7 languages).
Expand Down Expand Up @@ -66,7 +67,7 @@ let package = Package(
"FluidAudioCLI",
],
resources: [
.copy("TTS/LuxTts/Resources")
.process("TTS/LuxTts/Resources")
]
),
],
Expand Down
6 changes: 2 additions & 4 deletions Sources/FluidAudio/TTS/LuxTts/G2p/LuxTtsG2p.swift
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,9 @@ public struct LuxTtsG2p: Sendable {
public init() throws {
guard
let lexiconURL = Bundle.module.url(
forResource: "luxtts_en_us_lexicon.tsv", withExtension: "zz",
subdirectory: "Resources"),
forResource: "luxtts_en_us_lexicon.tsv", withExtension: "zz"),
let auxURL = Bundle.module.url(
forResource: "luxtts_en_us_g2p_aux", withExtension: "json",
subdirectory: "Resources")
forResource: "luxtts_en_us_g2p_aux", withExtension: "json")
else {
throw LuxTtsError.tokenizerFailed("bundled G2P resources missing")
}
Expand Down
5 changes: 1 addition & 4 deletions Tests/FluidAudioTests/TTS/LuxTts/LuxTtsFixtures.swift
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,7 @@ struct LuxTtsFixtures: Decodable {
// MARK: - Loading

static func resourceURL(_ name: String) throws -> URL {
guard
let url = Bundle.module.url(
forResource: name, withExtension: nil, subdirectory: "Resources")
else {
guard let url = Bundle.module.url(forResource: name, withExtension: nil) else {
throw XCTSkip("LuxTts fixture resource missing: \(name)")
}
return url
Expand Down
15 changes: 15 additions & 0 deletions Tests/FluidAudioTests/TTS/LuxTts/LuxTtsG2pTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,21 @@ import XCTest
/// the mobius worktree; these tests pin representative behaviors.
final class LuxTtsG2pTests: XCTestCase {

func testFixtureResourcesAreProcessedAtBundleRoot() {
XCTAssertFalse(
FileManager.default.fileExists(
atPath: Bundle.module.bundleURL
.appendingPathComponent("Resources", isDirectory: true).path
),
"LuxTTS test resources must not create a reserved top-level Resources directory"
)
XCTAssertTrue(
FileManager.default.fileExists(
atPath: Bundle.module.bundleURL.appendingPathComponent("luxtts_fixtures.json").path
)
)
}

private static let g2p: LuxTtsG2p = {
do {
return try LuxTtsG2p()
Expand Down
Loading