feat: time signatures, bar editing and quarter stamps for beat timelines

tests/mock.py

@@ -167,3 +167,24 @@ def patch_ask_for_string_dialog(success: bool | list[bool], string: str | list[s
     return_values = list(zip(string, success, strict=True))
     with patch.object(QInputDialog, "getText", side_effect=return_values):
         yield
+
+
+@contextmanager
+def patch_ask_for_int_dialog(success: bool | list[bool], number: int | list[int]):
+    """Patches QInputDialog.getInt to return the specified success values and numbers.
+
+    Args:
+        success: Whether the dialog was successful. If a list, the success value for each iteration.
+        number: Number input by user. If a list of numbers, the input values for each iteration.
+    """
+
+    if not isinstance(success, list):
+        success = [success]
+        if not isinstance(number, list):
+            number = [number]
+        else:
+            raise ValueError("number must be an int if success is a bool.")
+
+    return_values = list(zip(number, success, strict=True))
+    with patch.object(QInputDialog, "getInt", side_effect=return_values):
+        yield

tests/parsers/csv/test_beats_from_csv.py

@@ -1,6 +1,8 @@
 from pathlib import Path
 from unittest.mock import mock_open, patch
 
+import pytest
+
 from tests.parsers.csv.common import assert_in_errors
 from tilia.parsers.csv.beat import beats_from_csv
 from tilia.settings import settings
@@ -128,3 +130,136 @@ def test_measure_number_on_every_beat_is_forced_once(beat_tlui):
 
     # A measure forced once per beat would need a reset per beat.
     assert not beat_tlui[4].label.isVisible()
+
+
+def beat_unit_values(beat_tl):
+    return [
+        (beat_tl.get_component(u.beat_id).time, u.denominator, u.units)
+        for u in beat_tl.beat_units
+    ]
+
+
+class TestTimeSignatureColumn:
+    def test_rows_give_their_measures_time_signatures(self, beat_tl):
+        beat_tl.beat_pattern = [2]
+        data = "time,time_signature\n0,6/8\n1,\n2,5/8(3 2)\n3,\n4,2/4\n5,"
+
+        success, errors = _import_with_patch(beat_tl, data)
+
+        assert success
+        assert errors == []
+        assert [m.time_signature for m in beat_tl.measure_meters] == [
+            (6, 8),
+            (5, 8),
+            (2, 4),
+        ]
+        assert beat_unit_values(beat_tl) == [(0, 8, "3"), (2, 8, "3+2"), (4, 4, "1")]
+
+    def test_a_time_signature_carries_on(self, beat_tl):
+        beat_tl.beat_pattern = [2]
+
+        _import_with_patch(beat_tl, "time,time_signature\n0,6/8\n1,\n2,\n3,")
+
+        assert [m.time_signature for m in beat_tl.measure_meters] == [(6, 8), (6, 8)]
+
+    def test_a_row_inside_a_measure_sets_that_measure(self, beat_tl):
+        beat_tl.beat_pattern = [2]
+
+        _import_with_patch(beat_tl, "time,time_signature\n0,\n1,6/8\n2,\n3,")
+
+        assert beat_unit_values(beat_tl) == [(0, 8, "3")]
+
+    def test_invalid_values_are_reported(self, beat_tl):
+        beat_tl.beat_pattern = [2]
+        data = "time,time_signature\n0,3/0\n1,\n2,4/4(2 1 1)\n3,\n4,x\n5,\n6,3/8\n7,"
+
+        success, errors = _import_with_patch(beat_tl, data)
+
+        assert_in_errors("'3/0' is not a valid time signature", errors)
+        assert_in_errors("It gives 3 taps, but the bar has 2.", errors)
+        assert_in_errors("'x' is not a valid time signature", errors)
+        # The first beat keeps its default time signature; only the valid row
+        # adds one.
+        assert beat_unit_values(beat_tl) == [(0, 4, "1"), (6, 8, "3/2")]
+
+    def test_a_time_signature_carries_on_over_other_numbers_of_taps(self, beat_tl):
+        data = "time,is_first_in_measure,time_signature\n0,True,6/8\n1,,\n2,True,\n3,,\n4,,"
+
+        _import_with_patch(beat_tl, data)
+
+        assert beat_tl.beats_in_measure == [2, 3]
+        assert [m.time_signature for m in beat_tl.measure_meters] == [(6, 8), (6, 8)]
+
+    @pytest.mark.parametrize(
+        "text, time_signatures",
+        [
+            ("6/8(3 3)", [(6, 8), (9, 8), (6, 8)]),
+            ("2", [(2, 4), (3, 4), (2, 4)]),
+        ],
+    )
+    def test_a_time_signature_carries_on_over_measures_it_does_not_fit(
+        self, beat_tl, text, time_signatures
+    ):
+        data = (
+            "time,is_first_in_measure,time_signature\n"
+            f"0,True,{text}\n1,,\n2,True,\n3,,\n4,,\n5,True,\n6,,"
+        )
+
+        success, errors = _import_with_patch(beat_tl, data)
+
+        assert errors == []
+        assert beat_tl.beats_in_measure == [2, 3, 2]
+        assert [m.time_signature for m in beat_tl.measure_meters] == time_signatures
+
+    def test_a_time_signature_replaces_the_patterns_later_ones(self, beat_tl):
+        beat_tl.beat_pattern = "2[2/4] 3/4"
+        rows = "\n".join(f"{time}," for time in range(1, 9))
+
+        _import_with_patch(beat_tl, f"time,time_signature\n0,6/8\n{rows}")
+
+        assert [m.time_signature for m in beat_tl.measure_meters] == [(6, 8)] * 4
+
+    def test_times_in_any_order(self, beat_tl):
+        beat_tl.beat_pattern = [2]
+        data = "time,time_signature\n4,3/4\n0,6/8\n1,\n2,\n3,\n5,"
+
+        success, errors = _import_with_patch(beat_tl, data)
+
+        assert errors == []
+        assert beat_tl.beats_in_measure == [2, 2, 2]
+        assert [m.time_signature for m in beat_tl.measure_meters] == [
+            (6, 8),
+            (6, 8),
+            (3, 4),
+        ]
+
+    def test_a_number_alone_is_assumed(self, beat_tl):
+        beat_tl.beat_pattern = [2]
+
+        _import_with_patch(beat_tl, "time,time_signature\n0,2\n1,")
+
+        assert beat_unit_values(beat_tl) == [(0, 4, "1")]
+        assert beat_tl.beat_units[0].assumed
+
+    def test_without_the_column(self, beat_tl):
+        _import_with_patch(beat_tl, "time\n0\n1")
+
+        assert beat_unit_values(beat_tl) == [(0, 4, "1")]
+        assert beat_tl.beat_units[0].assumed
+
+    def test_values_from_the_file_are_not_assumed(self, beat_tl):
+        beat_tl.beat_pattern = [2]
+
+        _import_with_patch(beat_tl, "time,time_signature\n0,2/4\n1,")
+
+        assert beat_unit_values(beat_tl) == [(0, 4, "1")]
+        assert not beat_tl.beat_units[0].assumed
+
+
+def test_times_alone_follow_the_patterns_time_signatures(beat_tl):
+    beat_tl.beat_pattern = "6/8(3 3)"
+
+    _import_with_patch(beat_tl, "time\n0\n1\n2\n3")
+
+    assert [m.time_signature for m in beat_tl.measure_meters] == [(6, 8), (6, 8)]
+    assert not any(m.is_assumed for m in beat_tl.measure_meters)

tests/parsers/csv/test_markers_from_csv.py

@@ -60,7 +60,7 @@ def test_markers_by_measure_from_csv_multiple_measures_with_number(
     beat_tlui.create_beat(time=2)
     beat_tlui.create_beat(time=3)
 
-    beat_tl.measure_numbers = [1, 1, 1]
+    beat_tl.set_measure_numbers([1, 1, 1])
 
     beat_tl.recalculate_measures()
 

tests/parsers/score/test_score_from_musicxml.py

@@ -242,7 +242,7 @@ def test_changing_attributes(score_tl, beat_tl, tmp_path):
     beat_tl.set_data("beat_pattern", [1])
     for i in range(6):
         beat_tl.create_beat(i)
-    beat_tl.measure_numbers = [1, 3, 0, 2, 4, 5]
+    beat_tl.set_measure_numbers([1, 3, 0, 2, 4, 5])
     beat_tl.recalculate_measures()
 
     _import_with_patch(score_tl, beat_tl, example, tmp_path)
@@ -656,7 +656,7 @@ def test_notes_in_a_measure_the_beat_timeline_skips_are_not_imported(
     beat_tl.set_data("beat_pattern", [1])
     for i in range(4):
         beat_tl.create_beat(i)
-    beat_tl.measure_numbers = [1, 3, 4, 5]
+    beat_tl.set_measure_numbers([1, 3, 4, 5])
     beat_tl.recalculate_measures()
 
     success, errors = _import_with_patch(

tests/test_export.py

@@ -180,3 +180,69 @@ def test_image_export_resize_rejected(self, qtui, monkeypatch, tmp_path):
         commands.execute("file.export.img", image_path)
 
         assert not image_path.exists()
+
+
+class TestExportTimeSignatures:
+    @staticmethod
+    def export(tmp_path):
+        commands.execute("file.export.json", path=tmp_path / "test.json")
+        with open(tmp_path / "test.json", encoding="utf-8") as f:
+            return json.load(f)["timelines"][0]["components"]
+
+    def test_time_signatures_are_exported(self, tilia, beat_tlui, tmp_path):
+        for time in range(4):
+            commands.execute("media.seek", time)
+            commands.execute("timeline.beat.add")
+        commands.execute("timeline.beat.set_pattern", beat_tlui, pattern="6/8(2 1 2 1)")
+
+        components = self.export(tmp_path)
+
+        assert [c["kind"] for c in components] == ["BEAT"] * 4 + ["TIME_SIGNATURE"]
+        assert components[-1] == {
+            "time": 0,
+            "measure": 1,
+            "time_signature": "6/8",
+            "taps": "2 1 2 1",
+            "assumed": False,
+            "kind": "TIME_SIGNATURE",
+        }
+
+    @pytest.mark.parametrize(
+        "pattern, beat_count, time_signature, exported",
+        [("2", 7, "6/8", ["6/8", "3/8"]), ("4", 10, "4/4", ["4/4", "2/4"])],
+    )
+    def test_an_unfinished_last_measure_is_exported_as_tapped(
+        self, tilia, beat_tlui, tmp_path, pattern, beat_count, time_signature, exported
+    ):
+        commands.execute("timeline.beat.set_pattern", beat_tlui, pattern=pattern)
+        for time in range(beat_count):
+            commands.execute("media.seek", time)
+            commands.execute("timeline.beat.add")
+        timeline = beat_tlui.timeline
+        timeline.set_time_signature(time_signature, 0, timeline.measure_count)
+
+        components = self.export(tmp_path)
+
+        # As the timeline's labels show it.
+        assert [c["time_signature"] for c in components if "time_signature" in c] == (
+            exported
+        )
+
+    def test_one_per_change(self, tilia, beat_tlui, tmp_path):
+        commands.execute("timeline.beat.set_pattern", beat_tlui, pattern="2[2/4] 3/4")
+        for time in range(9):
+            commands.execute("media.seek", time)
+            commands.execute("timeline.beat.add")
+
+        components = self.export(tmp_path)
+
+        time_signatures = [
+            (c["time"], c["measure"], c["time_signature"], c["assumed"])
+            for c in components
+            if c["kind"] == "TIME_SIGNATURE"
+        ]
+        assert time_signatures == [
+            (0, 1, "2/4", False),
+            (4, 3, "3/4", False),
+            (7, 4, "2/4", False),
+        ]