importer chnges

2026-11-05 12:08:11 +00:00
parent 97662bf4bf
commit 3efe4f616e
3 changed files with 143 additions and 20 deletions
@@ -406,6 +406,56 @@ final class KJamsCloneTests: XCTestCase {
        XCTAssertEqual(model.songs.first?.title,"Title");XCTAssertEqual(model.songs.first?.artist,"Artist");XCTAssertEqual(model.songs.first?.trackNumber,"01");XCTAssertTrue(model.canUndoNames)
        try await Task.sleep(nanoseconds:100_000_000)
    }
+    @MainActor func testLiveTuningFollowsPerformingSingerAndPreservesOtherPreferences() async throws {
+        let root = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString);defer { try? FileManager.default.removeItem(at:root) }
+        let model = AppModel(storageURL:root);defer { model.player.stop() }
+        _ = try model.createEntity(.venue,name:"Hall");let a = try model.createEntity(.singer,name:"Alex"),b = try model.createEntity(.singer,name:"Sam"),db = try XCTUnwrap(model.library)
+        let audio = try XCTUnwrap(Bundle(for:Self.self).resourceURL?.appendingPathComponent("Fixtures/Demo.mp3"))
+        let id = try db.add(title:"Demo",audio:audio.path,cdg:nil),other = try db.add(title:"Other",audio:"/other.mp3",cdg:nil)
+        try db.saveDefaultPreference(song:id,value:.init(pitch:1,tempo:1.05))
+        try db.savePreference(song:id,singer:a,value:.init(pitch:2,tempo:1.1,rating:5));try db.savePreference(song:id,singer:b,value:.init(pitch:-4,tempo:0.8,rating:2))
+        try model.refresh();try model.play(try XCTUnwrap(model.songs.first{$0.id == id}),singer:a)
+        model.selectedSinger = b
+        try await Task.sleep(nanoseconds:100_000_000);let previousTime = model.player.time
+        model.updateLiveTuning(pitch:3,tempo:0.95)
+        XCTAssertTrue(model.player.playing);XCTAssertEqual(model.playbackSinger,a);XCTAssertEqual(model.player.pitch,3);XCTAssertEqual(model.player.tempo,0.95)
+        XCTAssertEqual(try db.preference(song:id,singer:a),.init(pitch:3,tempo:0.95,rating:5))
+        XCTAssertEqual(try db.preference(song:id,singer:b),.init(pitch:-4,tempo:0.8,rating:2));XCTAssertEqual(try db.defaultPreference(song:id).pitch,1)
+        XCTAssertEqual(model.preference(id).pitch,-4);XCTAssertEqual(model.tuningForControls(id).pitch,3)
+        model.updateTuning(id,tempo:1.02)
+        XCTAssertEqual(try db.preference(song:id,singer:a).tempo,1.02);XCTAssertEqual(try db.preference(song:id,singer:b).tempo,0.8)
+        try await Task.sleep(nanoseconds:100_000_000);XCTAssertGreaterThanOrEqual(model.player.time,previousTime)
+        XCTAssertEqual(try db.preference(song:other,singer:a).pitch,0)
+        let reopened = try Library(url:root.appendingPathComponent("Library.sqlite"));XCTAssertEqual(try reopened.preference(song:id,singer:a).pitch,3)
+    }
+    @MainActor func testLiveTuningWithoutPerformingSingerIsTemporary() throws {
+        let root = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString);defer { try? FileManager.default.removeItem(at:root) }
+        let model = AppModel(storageURL:root);defer { model.player.stop() }
+        let db = try XCTUnwrap(model.library),audio = try XCTUnwrap(Bundle(for:Self.self).resourceURL?.appendingPathComponent("Fixtures/Demo.mp3"))
+        let id = try db.add(title:"Demo",audio:audio.path,cdg:nil);try db.saveDefaultPreference(song:id,value:.init(pitch:1,tempo:1.1));try model.refresh()
+        try model.play(try XCTUnwrap(model.songs.first));XCTAssertNil(model.playbackSinger)
+        let singer = try model.createEntity(.singer,name:"Browsing Singer");model.selectedSinger = singer
+        model.updateTuning(id,pitch:4,tempo:0.9)
+        XCTAssertEqual(model.player.pitch,4);XCTAssertEqual(model.player.tempo,0.9)
+        XCTAssertEqual(try db.defaultPreference(song:id).pitch,1);XCTAssertEqual(try db.defaultPreference(song:id).tempo,1.1)
+        XCTAssertEqual(try db.preference(song:id,singer:singer).pitch,1)
+    }
+    @MainActor func testInvalidLiveTuningDoesNotChangePlaybackOrSavedSettings() throws {
+        let root = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString);defer { try? FileManager.default.removeItem(at:root) }
+        let model = AppModel(storageURL:root);defer { model.player.stop() }
+        let audio = try XCTUnwrap(Bundle(for:Self.self).resourceURL?.appendingPathComponent("Fixtures/Demo.mp3")),db = try XCTUnwrap(model.library)
+        let id = try db.add(title:"Demo",audio:audio.path,cdg:nil);try model.refresh();try model.play(try XCTUnwrap(model.songs.first))
+        model.updateLiveTuning(pitch:.nan,tempo:3)
+        XCTAssertNotNil(model.error);XCTAssertEqual(model.player.pitch,0);XCTAssertEqual(model.player.tempo,1);XCTAssertTrue(model.player.playing);XCTAssertEqual(try db.defaultPreference(song:id).pitch,0)
+    }
+    func testLibraryPaginationUsesTwentyRowsAndClampsAfterFiltering() {
+        let rows = Array(1...43)
+        let first = LibraryPage(total:rows.count,requested:0),middle = LibraryPage(total:rows.count,requested:1),last = LibraryPage(total:rows.count,requested:99)
+        XCTAssertEqual(first.count,3);XCTAssertEqual(Array(rows[first.range]),Array(1...20));XCTAssertEqual(Array(rows[middle.range]),Array(21...40));XCTAssertEqual(Array(rows[last.range]),[41,42,43])
+        let filtered = LibraryPage(total:7,requested:2);XCTAssertEqual(filtered.number,0);XCTAssertEqual(filtered.range,0..<7)
+        let empty = LibraryPage(total:0,requested:9);XCTAssertEqual(empty.number,0);XCTAssertTrue(empty.range.isEmpty)
+        XCTAssertEqual(LibraryPage(total:20,requested:1).count,1);XCTAssertEqual(LibraryPage(total:40,requested:1).range,20..<40)
+    }
    func packet(_ instruction: UInt8, _ data: [UInt8]) -> [UInt8] { [9,instruction,0,0] + Array((data + Array(repeating: 0,count:16)).prefix(16)) + [0,0,0,0] }
    func testPresetTileXORAndInvalidCoordinates() {
        var d = CDGDecoder()