1 files changed, 149 insertions, 5 deletions
diff --git a/packages/meshbay-node/tests/test_enrich_audio.py b/packages/meshbay-node/tests/test_enrich_audio.py
index 62d0a0a..221f1c6 100644
--- a/packages/meshbay-node/tests/test_enrich_audio.py
+++ b/packages/meshbay-node/tests/test_enrich_audio.py
@@ -6,12 +6,15 @@ import subprocess
 from pathlib import Path
 
 import pytest
-
 from meshbay_common.protocol import IndexEntry
 from meshbay_node.indexer.enrich_audio import (
-    AudioEnricher, _artist_album_from_ancestors, _extract_cover,
+    AudioEnricher,
+    _artist_album_from_ancestors,
+    _clean_tag,
+    _extract_cover,
+    _split_top_level_folder,
 )
-from meshbay_node.indexer.title_parse import parse_track_filename
+from meshbay_node.indexer.title_parse import parse_track_filename, strip_track_prefix
 from meshbay_node.media_cache import MediaCache
 
 _HAVE_FFMPEG = shutil.which("ffmpeg") and shutil.which("ffprobe")
@@ -54,12 +57,100 @@ def test_artist_album_from_ancestors_reads_artist_album_track_layout(tmp_path):
     track = folder / "01 - A Track.mp3"
     track.touch()
 
-    artist, album = _artist_album_from_ancestors(track)
+    artist, album = _artist_album_from_ancestors(track, tmp_path)
 
     assert artist == "Some Artist"
     assert album == "Some Album"
 
 
+def test_artist_album_from_ancestors_refuses_to_name_the_root_as_artist(tmp_path):
+    """
+    The regression this whole revision exists for: a flat `Artist/track.mp3`
+    layout (no album subfolder) used to read the *root's own directory
+    name* as the artist, because the walk always climbed two levels with no
+    idea where the root was. Measured live: 289 tracks across 41 real,
+    unrelated artists collapsed into one fake "artist" this way — the
+    single biggest bucket in the whole library.
+    """
+    folder = tmp_path / "Ben Harper"
+    folder.mkdir(parents=True)
+    track = folder / "Ashes.mp3"
+    track.touch()
+
+    artist, album = _artist_album_from_ancestors(track, tmp_path)
+
+    assert artist == "Ben Harper"
+    assert album is None, "no album folder exists — must not invent one, or swap artist/album"
+
+
+def test_artist_album_from_ancestors_file_directly_in_root_has_no_context(tmp_path):
+    track = tmp_path / "loose_track.mp3"
+    track.touch()
+
+    artist, album = _artist_album_from_ancestors(track, tmp_path)
+
+    assert (artist, album) == (None, None)
+
+
+def test_artist_album_from_ancestors_without_a_root_keeps_the_old_two_level_behaviour(tmp_path):
+    """No root resolved (should not happen in practice, but must degrade safely)."""
+    folder = tmp_path / "Some Artist" / "Some Album"
+    folder.mkdir(parents=True)
+    track = folder / "01 - A Track.mp3"
+    track.touch()
+
+    artist, album = _artist_album_from_ancestors(track, None)
+
+    assert artist == "Some Artist"
+    assert album == "Some Album"
+
+
+def test_split_top_level_folder_splits_artist_dash_album():
+    artist, album = _split_top_level_folder("GHOST DOG - Soundtrack")
+    assert artist == "GHOST DOG"
+    assert album == "Soundtrack"
+
+
+def test_split_top_level_folder_with_no_separator_is_artist_only():
+    artist, album = _split_top_level_folder("Ben Harper")
+    assert artist == "Ben Harper"
+    assert album is None
+
+
+def test_split_top_level_folder_cleans_rip_tag_noise():
+    artist, album = _split_top_level_folder(
+        "Sinsemilia - Premiere Recolte [MP3 320kbps Album]")
+    assert artist == "Sinsemilia"
+    assert album == "Premiere Recolte"
+
+
+def test_clean_tag_filters_known_placeholders():
+    assert _clean_tag("No Artist") is None
+    assert _clean_tag("unknown artist") is None
+    assert _clean_tag("Nouvel artiste (334)") is None
+    assert _clean_tag("Nouveau titre (12)") is None
+    assert _clean_tag("") is None
+    assert _clean_tag(None) is None
+
+
+def test_clean_tag_keeps_various_artists_as_a_real_credit():
+    """A real, meaningful compilation credit — not a placeholder to blank out."""
+    assert _clean_tag("Various Artists") == "Various Artists"
+
+
+def test_clean_tag_keeps_a_real_value():
+    assert _clean_tag("Björk") == "Björk"
+
+
+def test_strip_track_prefix_removes_a_leaked_filename_number():
+    assert strip_track_prefix("01 - Venus As A Boy (Edited Lp Version)") == \
+        "Venus As A Boy (Edited Lp Version)"
+
+
+def test_strip_track_prefix_is_a_noop_on_a_clean_title():
+    assert strip_track_prefix("Venus As A Boy") == "Venus As A Boy"
+
+
 # ── end-to-end against a real (tiny, synthetic) MP3 file ────────────────────
 
 pytestmark_ffmpeg = pytest.mark.skipif(not _HAVE_FFMPEG, reason="ffmpeg/ffprobe not installed")
@@ -130,7 +221,7 @@ async def test_enricher_falls_back_to_filename_and_folder_when_tags_absent(tmp_p
     async def on_done(file_id, fields):
         done.set_result((file_id, fields))
 
-    enricher.spawn(entry, clip, on_done)
+    enricher.spawn(entry, clip, on_done, tmp_path)
     _, fields = await asyncio.wait_for(done, timeout=30)
 
     assert fields["display_title"] == "Filename Title"
@@ -140,6 +231,59 @@ async def test_enricher_falls_back_to_filename_and_folder_when_tags_absent(tmp_p
 
 
 @pytestmark_ffmpeg
+@pytest.mark.asyncio
+async def test_enricher_falls_back_to_artist_only_for_a_flat_top_level_dir(tmp_path, media_cache):
+    """The real-world regression case, end to end through the whole pool."""
+    folder = tmp_path / "Ben Harper"
+    folder.mkdir(parents=True)
+    clip = folder / "Ashes.mp3"
+    _make_clip(clip)   # no metadata tags at all
+    entry = IndexEntry(id="fileid3", name=clip.name,
+                        path=str(clip.relative_to(tmp_path)),
+                        size=clip.stat().st_size, type="audio", added_at=0)
+
+    enricher = AudioEnricher(media_cache)
+    done = asyncio.get_event_loop().create_future()
+
+    async def on_done(file_id, fields):
+        done.set_result((file_id, fields))
+
+    enricher.spawn(entry, clip, on_done, tmp_path)
+    _, fields = await asyncio.wait_for(done, timeout=30)
+
+    assert fields["artist"] == "Ben Harper"
+    assert fields["album"] is None
+    assert fields["artist"] != tmp_path.name, \
+        "must never fall back to the shared root's own directory name"
+
+
+@pytestmark_ffmpeg
+@pytest.mark.asyncio
+async def test_enricher_uses_a_sibling_cover_file_when_no_embedded_art(tmp_path, media_cache):
+    folder = tmp_path / "Some Artist" / "Some Album"
+    folder.mkdir(parents=True)
+    clip = folder / "01 - A Track.mp3"
+    _make_clip(clip)
+    (folder / "Folder.jpg").write_bytes(b"\xff\xd8\xff\xe0fake-jpeg-bytes")
+    entry = IndexEntry(id="fileid4", name=clip.name,
+                        path=str(clip.relative_to(tmp_path)),
+                        size=clip.stat().st_size, type="audio", added_at=0)
+
+    enricher = AudioEnricher(media_cache)
+    done = asyncio.get_event_loop().create_future()
+
+    async def on_done(file_id, fields):
+        done.set_result((file_id, fields))
+
+    enricher.spawn(entry, clip, on_done, tmp_path)
+    _, fields = await asyncio.wait_for(done, timeout=30)
+
+    assert fields.get("thumb_hash"), "a Folder.jpg beside the track must be picked up as its cover"
+    stored = await media_cache.get_thumb(fields["thumb_hash"])
+    assert stored == b"\xff\xd8\xff\xe0fake-jpeg-bytes"
+
+
+@pytestmark_ffmpeg
 def test_extract_cover_returns_none_when_no_apic_frame(tmp_path):
     from mutagen import File as MutagenFile