8b7609cdb2
Ashh: the manual-match modal fuzzy-searches a service and shows the top 8. When the right release isn't in those 8 (common title — their example was "Idols", which returns 8 unrelated releases and not Yungblud's), there was no way through. But the user usually already knows the exact MBID. Now the modal's search box doubles as a direct-ID box. Paste a MusicBrainz MBID (bare UUID or a musicbrainz.org URL) and SoulSync looks that exact entity up and shows it as the single result to confirm + Match — no fighting the search ranking. - core/library/direct_id.py: pure detector, returns the canonical ID only when the text unambiguously IS one (whole-query UUID, or a UUID inside a musicbrainz.org URL). "Idols", "Yungblud Idols", a UUID buried in free text → None, so normal search is never hijacked. - _search_service: direct-ID fast path before the fuzzy search — get_release (→ get_release_group fallback for albums) / get_artist / get_recording. A pasted-but-unresolvable ID falls THROUGH to fuzzy search, so a typo can't dead-end the modal. - UI: MusicBrainz placeholder now says "…or paste a MusicBrainz ID/URL". Detector is service-keyed so Spotify/iTunes/etc. direct IDs can be added later; today only MusicBrainz has a confirmable direct lookup, matching the reporter's ask + screenshot. 9 tests: detector truth table (bare/URL/plain/ buried/other-service) + dispatch (confirmed release, release-group fallback, unresolvable→fuzzy, plain query skips direct lookup).
53 lines
2 KiB
Python
53 lines
2 KiB
Python
"""Direct-ID detection for manual matching (Ashh's request).
|
|
|
|
The manual-match modal fuzzy-searches a service and shows the top 8 hits.
|
|
When the right release isn't in those 8 (common name like "Idols"), the user
|
|
is stuck. But they often already KNOW the exact ID — so let them paste it
|
|
and match directly instead of fighting the search ranking.
|
|
|
|
This module is the pure detector: given a service + the text the user typed,
|
|
return the canonical ID if the text *is* an ID (bare or pasted as a URL/URI),
|
|
else None. No network, no I/O — the caller decides whether to do a direct
|
|
lookup or fall through to the normal fuzzy search.
|
|
|
|
Conservative by design: only return an ID when the text matches that
|
|
service's ID shape unambiguously. Anything else returns None so a normal
|
|
text search still runs (pasting "Idols" never looks like an ID).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import re
|
|
from typing import Optional
|
|
|
|
# MusicBrainz MBIDs are UUIDs (8-4-4-4-12 hex). Accept a bare UUID or one
|
|
# embedded in a musicbrainz.org URL (/artist/<id>, /release/<id>, ...).
|
|
_UUID_RE = re.compile(
|
|
r"([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})",
|
|
re.IGNORECASE,
|
|
)
|
|
|
|
|
|
def extract_direct_id(service: str, entity_type: str, query: str) -> Optional[str]:
|
|
"""Return the canonical service ID if ``query`` is one, else None.
|
|
|
|
``entity_type`` is accepted for future per-type shapes (e.g. Spotify
|
|
track vs album URLs); MusicBrainz UUIDs are type-agnostic so it's unused
|
|
there today."""
|
|
if not query:
|
|
return None
|
|
text = query.strip()
|
|
if not text:
|
|
return None
|
|
|
|
service = (service or "").strip().lower()
|
|
|
|
if service == "musicbrainz":
|
|
# Bare UUID, or a MB URL — but ONLY a UUID. A search like "Idols"
|
|
# can't match, so normal search is never hijacked.
|
|
m = _UUID_RE.search(text)
|
|
if m and (text == m.group(1) or "musicbrainz.org" in text.lower()):
|
|
return m.group(1).lower()
|
|
return None
|
|
|
|
return None
|