fix(worker): match library ownership by rgMbid + retire stale failed attempts
Two related monitor bugs surfaced by owned albums that never leave the press:
1. Ownership was matched on (artist, album) strings, but MusicBrainz canonicalizes
the artist on import ("Kanye West"->"Ye", "Ne-Yo"->"Ne‐Yo", "The Goo Goo Dolls"
->"Goo Goo Dolls"). The strings no longer matched, so reconcile/enqueue/backfill
never recognized the album as owned — it stayed "wanted" and re-pressed every
retry interval. Match on the release-group MBID when the library row has one
(falling back to artist+album for scanned rows without an MBID) across
_in_library_at_cutoff, fulfill_owned_releases, and reconcile.
2. Each failed attempt left a needs_attention Request behind, so a hard-to-match
album piled up phantom "needs attention" cards on the press even after a later
attempt imported it (e.g. Maroon 5 "V": 3 stale cards + 1 success). Retire prior
failed attempts when a release is fulfilled or re-attempted (_retire_failed_attempts,
monitor-owned requests only — manual requests have no monitoredReleaseId).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -72,6 +72,52 @@ def test_grabbed_past_window_is_fulfilled_not_enqueued(conn):
|
||||
assert _state(conn, rel_id) == "fulfilled"
|
||||
|
||||
|
||||
def test_owned_by_rgmbid_despite_name_mismatch_is_fulfilled(conn):
|
||||
# The monitor followed "Kanye West" but the library stores MB's canonical "Ye"; matching on
|
||||
# rgMbid recognises ownership so the release is fulfilled, not re-pressed.
|
||||
rel_id = insert_monitored_release(conn, artist_name="Kanye West", album="Graduation",
|
||||
rg_mbid="rg-grad", monitored=True, state="wanted")
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
'INSERT INTO "LibraryItem" (id, artist, album, path, source, format, '
|
||||
'"qualityClass", "rgMbid", "importedAt") '
|
||||
"VALUES (gen_random_uuid()::text, 'Ye', 'Graduation', '/m', 'soulseek', 'FLAC', 2, "
|
||||
"'rg-grad', now())"
|
||||
)
|
||||
conn.commit()
|
||||
assert enqueue_due(conn, CFG) == 0
|
||||
assert _state(conn, rel_id) == "fulfilled"
|
||||
|
||||
|
||||
def test_re_enqueue_retires_prior_failed_attempt(conn):
|
||||
# A hard-to-match release re-pressed each retry interval must not pile up needs_attention
|
||||
# Request rows; the prior failed attempt is retired when the next one is enqueued.
|
||||
rel_id = insert_monitored_release(conn, artist_name="X", album="Y", rg_mbid="rg-1",
|
||||
monitored=True, state="wanted")
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
'INSERT INTO "Request" (id, artist, album, status, "monitoredReleaseId", "createdAt") '
|
||||
"VALUES (gen_random_uuid()::text, 'X', 'Y', 'needs_attention', %s, now()) RETURNING id",
|
||||
(rel_id,),
|
||||
)
|
||||
req = cur.fetchone()[0]
|
||||
cur.execute(
|
||||
'INSERT INTO "Job" (id, "requestId", state, "currentStage", attempts, "createdAt", "updatedAt") '
|
||||
"VALUES (gen_random_uuid()::text, %s, 'needs_attention', 'rank', 1, now(), now())",
|
||||
(req,),
|
||||
)
|
||||
conn.commit()
|
||||
assert enqueue_due(conn, CFG) == 1
|
||||
assert _job_count_for(conn, rel_id) == 1 # old failed attempt retired, one fresh attempt
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
'SELECT j.state FROM "Job" j JOIN "Request" r ON r.id = j."requestId" '
|
||||
'WHERE r."monitoredReleaseId" = %s',
|
||||
(rel_id,),
|
||||
)
|
||||
assert cur.fetchone()[0] == "requested"
|
||||
|
||||
|
||||
def test_already_in_library_at_cutoff_is_fulfilled(conn):
|
||||
rel_id = insert_monitored_release(conn, artist_name="A", album="B", rg_mbid="rg-1",
|
||||
monitored=True, state="wanted")
|
||||
|
||||
Reference in New Issue
Block a user