997e76b6b4
Replaces the two organize-only triggers with a single reconcile_batch_playlists
called at both batch-completion points. It groups the batch's newly-resolved
tracks by their per-track playlist provenance:
- the batch's OWN organize playlist → full (re)build with prune, and
- a track that completed for a DIFFERENT playlist (e.g. a WISHLIST fulfilling a
track that belongs to an organize playlist) → ADDED to that folder, no prune.
So a late wishlist arrival now lands in its playlist folder immediately, instead
of only on the next sync/manual rebuild — the folder = the playlist's owned
members, kept true on every ownership change regardless of download path. Uses
the paths the batch already captured (no DB re-match, no waiting on the server
scan/sync). Non-fatal.
3 new reconcile tests (organize full-rebuild, wishlist add-without-prune, plain
batch no-op). 983 downloads/imports/playlist tests pass.
207 lines
8.8 KiB
Python
207 lines
8.8 KiB
Python
"""Playlist materialize SERVICE — builds the folder from a finished batch's own
|
|
payload (owned matched_file_path + downloaded final_file_path). Locks down: it
|
|
stitches owned + downloaded, ignores not-found/not-completed, de-dupes, gates on
|
|
the organize flag, and never depends on source IDs or a mirrored playlist."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from pathlib import Path
|
|
|
|
from core.playlists.materialize_service import (
|
|
collect_batch_real_paths,
|
|
materialize_playlist_from_batch,
|
|
rebuild_organized_playlists_from_db,
|
|
reconcile_batch_playlists,
|
|
)
|
|
|
|
|
|
class _Track:
|
|
"""Mimics database.DatabaseTrack — what check_track_exists returns."""
|
|
def __init__(self, file_path):
|
|
self.file_path = file_path
|
|
|
|
|
|
class _RebuildDB:
|
|
"""One organized playlist (Mix) + one not (Off); check_track_exists matches
|
|
by NAME via `owned` (track_name -> file_path), so no source IDs involved."""
|
|
def __init__(self, owned):
|
|
self.owned = owned
|
|
|
|
def get_mirrored_playlists(self, profile_id=1):
|
|
return [
|
|
{"id": 1, "name": "Mix", "organize_by_playlist": True},
|
|
{"id": 2, "name": "Off", "organize_by_playlist": False},
|
|
]
|
|
|
|
def get_mirrored_playlist_tracks(self, pid):
|
|
if pid == 1:
|
|
return [{"track_name": "A", "artist_name": "x"},
|
|
{"track_name": "Gone", "artist_name": "y"}] # not owned
|
|
return [{"track_name": "B", "artist_name": "z"}]
|
|
|
|
def check_track_exists(self, title, artist, confidence_threshold=0.8,
|
|
server_source=None, album=None, candidate_tracks=None):
|
|
fp = self.owned.get(title)
|
|
return (_Track(fp), 1.0) if fp else (None, 0.0)
|
|
|
|
|
|
class _Cfg:
|
|
def __init__(self, root, mode="symlink"):
|
|
self._d = {"playlists.materialize_path": root, "playlists.materialize_mode": mode}
|
|
|
|
def get(self, key, default=None):
|
|
return self._d.get(key, default)
|
|
|
|
|
|
def _mk(tmp_path: Path, *names) -> list[str]:
|
|
paths = []
|
|
for n in names:
|
|
f = tmp_path / "Music" / n
|
|
f.parent.mkdir(parents=True, exist_ok=True)
|
|
f.write_bytes(b"audio")
|
|
paths.append(str(f))
|
|
return paths
|
|
|
|
|
|
def test_collect_stitches_owned_and_downloaded(tmp_path: Path):
|
|
owned, downloaded = _mk(tmp_path, "Owned.mp3"), _mk(tmp_path, "Fresh.mp3")
|
|
batch = {
|
|
"analysis_results": [
|
|
{"found": True, "matched_file_path": owned[0]},
|
|
{"found": False, "matched_file_path": None}, # not owned → skip
|
|
],
|
|
"queue": ["t1", "t2"],
|
|
}
|
|
tasks = {
|
|
"t1": {"status": "completed", "final_file_path": downloaded[0]},
|
|
"t2": {"status": "failed", "final_file_path": None}, # not completed → skip
|
|
}
|
|
cfg = _Cfg(str(tmp_path / "Playlists"))
|
|
paths = collect_batch_real_paths(batch, tasks, config_manager=cfg)
|
|
assert paths == [owned[0], downloaded[0]] # owned first, then downloaded
|
|
|
|
|
|
def test_collect_dedupes(tmp_path: Path):
|
|
owned = _mk(tmp_path, "Same.mp3")
|
|
batch = {
|
|
"analysis_results": [{"found": True, "matched_file_path": owned[0]}],
|
|
"queue": ["t1"],
|
|
}
|
|
tasks = {"t1": {"status": "completed", "final_file_path": owned[0]}} # same file
|
|
cfg = _Cfg(str(tmp_path / "Playlists"))
|
|
assert collect_batch_real_paths(batch, tasks, config_manager=cfg) == [owned[0]]
|
|
|
|
|
|
def test_materialize_from_batch_all_owned(tmp_path: Path):
|
|
"""The all-owned case (no downloads) — folder built entirely from analysis."""
|
|
owned = _mk(tmp_path, "A.mp3", "B.mp3")
|
|
batch = {
|
|
"playlist_folder_mode": True,
|
|
"playlist_name": "Smack That",
|
|
"analysis_results": [
|
|
{"found": True, "matched_file_path": owned[0]},
|
|
{"found": True, "matched_file_path": owned[1]},
|
|
],
|
|
"queue": [],
|
|
}
|
|
cfg = _Cfg(str(tmp_path / "Playlists"))
|
|
summary = materialize_playlist_from_batch(batch, {}, cfg)
|
|
assert summary is not None and summary.linked == 2
|
|
pdir = Path(summary.playlist_dir)
|
|
assert pdir == tmp_path / "Playlists" / "Smack That"
|
|
assert (pdir / "A.mp3").resolve() == Path(owned[0]).resolve()
|
|
assert (pdir / "B.mp3").resolve() == Path(owned[1]).resolve()
|
|
|
|
|
|
def test_materialize_from_batch_owned_plus_downloaded(tmp_path: Path):
|
|
owned, downloaded = _mk(tmp_path, "Owned.mp3"), _mk(tmp_path, "Fresh.mp3")
|
|
batch = {
|
|
"playlist_folder_mode": True,
|
|
"playlist_name": "Mix",
|
|
"analysis_results": [{"found": True, "matched_file_path": owned[0]}],
|
|
"queue": ["t1"],
|
|
}
|
|
tasks = {"t1": {"status": "completed", "final_file_path": downloaded[0]}}
|
|
cfg = _Cfg(str(tmp_path / "Playlists"), mode="copy")
|
|
summary = materialize_playlist_from_batch(batch, tasks, cfg)
|
|
assert summary.copied == 2
|
|
pdir = Path(summary.playlist_dir)
|
|
assert (pdir / "Owned.mp3").is_file() and (pdir / "Fresh.mp3").is_file()
|
|
|
|
|
|
def test_materialize_skipped_when_not_organize(tmp_path: Path):
|
|
batch = {"playlist_folder_mode": False, "playlist_name": "X", "analysis_results": [], "queue": []}
|
|
assert materialize_playlist_from_batch(batch, {}, _Cfg(str(tmp_path / "Playlists"))) is None
|
|
assert not (tmp_path / "Playlists").exists()
|
|
|
|
|
|
def test_reconcile_organize_batch_full_rebuild(tmp_path: Path):
|
|
"""An organize-by-playlist batch → its own folder is fully (re)built from the
|
|
batch payload."""
|
|
owned, fresh = _mk(tmp_path, "Owned.mp3"), _mk(tmp_path, "Fresh.mp3")
|
|
batch = {
|
|
"playlist_folder_mode": True,
|
|
"playlist_name": "Mix",
|
|
"analysis_results": [{"found": True, "matched_file_path": owned[0]}],
|
|
"queue": ["t1"],
|
|
}
|
|
tasks = {"t1": {"status": "completed", "final_file_path": fresh[0],
|
|
"track_info": {"_playlist_name": "Mix"}}} # same playlist as batch
|
|
cfg = _Cfg(str(tmp_path / "Playlists"))
|
|
results = reconcile_batch_playlists(batch, tasks, cfg)
|
|
assert len(results) == 1 # only Mix (no double-add)
|
|
name, s = results[0]
|
|
assert name == "Mix" and s.linked == 2
|
|
pdir = Path(s.playlist_dir)
|
|
assert (pdir / "Owned.mp3").exists() and (pdir / "Fresh.mp3").exists()
|
|
|
|
|
|
def test_reconcile_wishlist_adds_to_other_playlist_without_pruning(tmp_path: Path):
|
|
"""The wishlist gap: a wishlist batch (not organize) downloads a track that
|
|
belongs to an organize playlist → it's ADDED to that playlist's folder, and
|
|
the folder's existing entries are NOT pruned."""
|
|
# Pre-seed Smack That with an existing symlink (a track from a prior batch).
|
|
existing = _mk(tmp_path, "Existing.mp3")[0]
|
|
from core.playlists.materialize import rebuild_playlist_folder
|
|
rebuild_playlist_folder(str(tmp_path / "Playlists"), "Smack That", [existing], "symlink")
|
|
|
|
# A WISHLIST batch (playlist_folder_mode False) completes a track tagged for
|
|
# the "Smack That" organize playlist.
|
|
late = _mk(tmp_path, "Late.mp3")[0]
|
|
batch = {"playlist_folder_mode": False, "playlist_name": "wishlist",
|
|
"analysis_results": [], "queue": ["w1"]}
|
|
tasks = {"w1": {"status": "completed", "final_file_path": late,
|
|
"track_info": {"_playlist_name": "Smack That"}}}
|
|
cfg = _Cfg(str(tmp_path / "Playlists"))
|
|
|
|
results = reconcile_batch_playlists(batch, tasks, cfg)
|
|
assert len(results) == 1 and results[0][0] == "Smack That"
|
|
pdir = tmp_path / "Playlists" / "Smack That"
|
|
assert (pdir / "Late.mp3").exists() # the wishlist track was ADDED
|
|
assert (pdir / "Existing.mp3").exists() # and the prior entry was NOT pruned
|
|
|
|
|
|
def test_reconcile_noop_for_plain_batch(tmp_path: Path):
|
|
"""A normal (non-organize, no provenance) batch → nothing happens."""
|
|
f = _mk(tmp_path, "X.mp3")[0]
|
|
batch = {"playlist_folder_mode": False, "playlist_name": "album",
|
|
"analysis_results": [], "queue": ["a1"]}
|
|
tasks = {"a1": {"status": "completed", "final_file_path": f, "track_info": {}}}
|
|
assert reconcile_batch_playlists(batch, tasks, _Cfg(str(tmp_path / "Playlists"))) == []
|
|
assert not (tmp_path / "Playlists").exists()
|
|
|
|
|
|
def test_rebuild_from_db_only_organized_and_owned(tmp_path: Path):
|
|
"""The manual button: rebuild every organized playlist by re-matching with
|
|
check_track_exists (name), linking only owned tracks."""
|
|
f = tmp_path / "Music" / "A.mp3"
|
|
f.parent.mkdir(parents=True, exist_ok=True)
|
|
f.write_bytes(b"audio")
|
|
db = _RebuildDB({"A": str(f)}) # 'Gone' + the 'Off' playlist's 'B' not owned
|
|
cfg = _Cfg(str(tmp_path / "Playlists"))
|
|
results = rebuild_organized_playlists_from_db(db, cfg, profile_id=1)
|
|
assert len(results) == 1 # only Mix (organize on)
|
|
name, s = results[0]
|
|
assert name == "Mix" and s.linked == 1 # only A owned; Gone skipped
|
|
assert (tmp_path / "Playlists" / "Mix" / "A.mp3").exists()
|
|
assert not (tmp_path / "Playlists" / "Off").exists()
|