Merge pull request #53 from MHFU-ModKit/ports/zinogre-names

feat(ports): name 82 of the Zinogre's clips

Author: sp00ktober

apps/studio/tests/monster/conftest.py

@@ -341,3 +341,14 @@ def workspace(
     ws.host_scenes[75] = Scene.from_bytes(synthetic_pac, "em75")
     yield ws
     ws.close()
+
+
+@pytest.fixture
+def zinogre_toml(ports: Path, tmp_path: Path) -> Path:
+    """A copy of the Zinogre's manifest named only welcome_howl and the clips its moves play: the
+    shipped names change as the owner names clips, so the tests keep their own."""
+    m = manifest.load(ports / "zinogre.toml")
+    howl = manifest.Clip(source=2, label="the howling he does when he notices you")
+    used = {mv.clip for mv in m.moves.values()}
+    m.clips = {"welcome_howl": howl, **{n: c for n, c in m.clips.items() if n in used}}
+    return manifest.save(m, tmp_path / "zinogre.toml")

apps/studio/tests/monster/test_clip_browser.py

@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # SPDX-FileCopyrightText: 2026 sp00ktober
 import random
-import shutil
 from collections.abc import Iterator
 from pathlib import Path
 
@@ -24,11 +23,9 @@ def open_port(games: Data, path: Path) -> MonsterWorkspace:
 
 
 @pytest.fixture
-def zinogre(games: Data, ports: Path, tmp_path: Path) -> Iterator[MonsterWorkspace]:
+def zinogre(games: Data, zinogre_toml: Path) -> Iterator[MonsterWorkspace]:
     """The Zinogre opened from a copy of its manifest."""
-    path = tmp_path / "zinogre.toml"
-    shutil.copy(ports / "zinogre.toml", path)
-    ws = open_port(games, path)
+    ws = open_port(games, zinogre_toml)
     yield ws
     ws.close()
 
@@ -121,12 +118,11 @@ def test_place_refusals(zinogre):
     assert "past the host's 123" in ws.message and entries(ws) == before
 
 
-def test_unplaced(games, ports, tmp_path, monkeypatch):
+def test_unplaced(games, ports, tmp_path, monkeypatch, zinogre_toml):
     """A host with 100 anims leaves 4 Zinogre clips out: listed, played from a preview, named
     without an anim; a placement over a pinned clip has nowhere to send it."""
     monkeypatch.setitem(layout.ENTRIES, 75, 100)
-    path = tmp_path / "zinogre.toml"
-    shutil.copy(ports / "zinogre.toml", path)
+    path = zinogre_toml
     ws = open_port(games, path)
     out = [r.id for r in ws.source_rows() if r.entry is None]
     assert len(out) == 4 and len(ws.scene.clips) == 98
@@ -176,15 +172,14 @@ def _clip(frames: int) -> Clip:
     return Clip([Track([Channel(0x008, [Keyframe(0, 0), Keyframe(0, frames)])])])
 
 
-def test_place_every_clip(games, ports, tmp_path):
+def test_place_every_clip(games, ports, tmp_path, zinogre_toml):
     """All 102 placed into a shuffled layout, one after another: each lands where it was put
     and stays, the saved manifest loads on that layout, and the port builds on it."""
     from mhfu_port import build, manifest
     from mhfu_studio.monster.clips import pac_clip_table
     from mhfu_studio.monster.document import PortDocument
 
-    path = tmp_path / "zinogre.toml"
-    shutil.copy(ports / "zinogre.toml", path)
+    path = zinogre_toml
     doc = PortDocument.open(path)
     d, h = build.donor(doc.manifest, games), build.host(doc.manifest, games)
     br = B.ClipBrowser(doc, d.clips, h.anim)
@@ -203,11 +198,10 @@ def test_place_every_clip(games, ports, tmp_path):
     assert all(table[e] == br.prints[cid] for cid, e in want.items())
 
 
-def test_view_follows_a_placement(gl, games, ports, tmp_path):
+def test_view_follows_a_placement(gl, games, ports, tmp_path, zinogre_toml):
     """On a viewport: the placed clip plays on in its new anim, and undo brings the old build
     back on screen."""
-    path = tmp_path / "zinogre.toml"
-    shutil.copy(ports / "zinogre.toml", path)
+    path = zinogre_toml
     ws = MonsterWorkspace(games)
     ws.intel_cache[75] = None
     ws.setup(gl)

apps/studio/tests/monster/test_clip_game.py

@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # SPDX-FileCopyrightText: 2026 sp00ktober
-import shutil
 from contextlib import nullcontext
 
 import pytest
@@ -93,10 +92,9 @@ def test_target():
         clip_game.target(Fake(), 75)
 
 
-def test_play_button(games, ports, tmp_path, game, calls):
+def test_play_button(games, ports, tmp_path, game, calls, zinogre_toml):
     """The picked clip's anim reaches the game; a clip moved since the save does not."""
-    path = tmp_path / "zinogre.toml"
-    shutil.copy(ports / "zinogre.toml", path)
+    path = zinogre_toml
     ws = MonsterWorkspace(games)
     ws.intel_cache[75] = None
     ws.open(path)

apps/studio/tests/monster/ui/test_clips.py

@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # SPDX-FileCopyrightText: 2026 sp00ktober
-import shutil
 from contextlib import nullcontext
 from pathlib import Path
 from typing import Any
@@ -96,9 +95,8 @@ def test_filler_is_loud(workspace: MonsterWorkspace, qtbot: Any) -> None:
 
 
 @pytest.fixture
-def zinogre(games: Any, ports: Path, tmp_path: Path, qtbot: Any) -> ClipsPanel:
-    path = tmp_path / "zinogre.toml"
-    shutil.copy(ports / "zinogre.toml", path)
+def zinogre(games: Any, qtbot: Any, zinogre_toml: Path) -> ClipsPanel:
+    path = zinogre_toml
     ws = MonsterWorkspace(games)
     ws.intel_cache[75] = None
     ws.open(path)
@@ -112,12 +110,14 @@ def ids(p: ClipsPanel) -> list[str]:
 def test_every_clip(zinogre: ClipsPanel) -> None:
     p = zinogre
     assert p.table.rowCount() == 102 and not p.table.isColumnHidden(0)
-    assert p.count.text() == "102 clips in 3 streams, 21 named" and kit.missing_tips(p) == []
+    named = len(p.ws.doc.manifest.clips)
+    assert p.count.text() == f"102 clips in 3 streams, {named} named"
+    assert kit.missing_tips(p) == []
     assert ids(p)[:3] == ["1", "2", "4"] and p.table.item(101, 1).text() == "56"
     p.filter.setText("stream 2")
     assert p.table.rowCount() == 39
     p.filter.setText("unnamed")
-    assert p.table.rowCount() == 81
+    assert p.table.rowCount() == 102 - named
 
 
 def test_name_and_next(zinogre: ClipsPanel) -> None: