b1f061a2a8
a pasted track link IS resolved + searched, but the 'bubble the exact track to the top'
step read getattr(t,'id') — and TrackResult has no top-level id (the source id lives in
_source_metadata['track_id']). so the bubble was a silent no-op: the linked track sat buried
among fuzzy text-search lookalikes and the user saw unrelated tracks. qobuz made it worse —
_qobuz_to_track_result never stamped _source_metadata at all, so the track had no id to match.
- stamp _source_metadata={'source':'qobuz','track_id':...} on qobuz TrackResults (mirrors tidal)
- extract the bubble into pure, tested helpers (linked_track_id / bubble_linked_track_first)
that read _source_metadata['track_id'] — fixes it for tidal too, str/int-safe, stable no-op
19 track-link tests (+6 new) + 87 qobuz/download tests green.
124 lines
4.3 KiB
Python
124 lines
4.3 KiB
Python
"""Parse pasted Tidal/Qobuz track links for the manual download search (#813)."""
|
|
|
|
from core.downloads.track_link import parse_download_track_link as p
|
|
|
|
|
|
def test_tidal_track_url_with_region_suffix():
|
|
assert p('https://tidal.com/track/434945950/u') == ('tidal', '434945950')
|
|
|
|
|
|
def test_tidal_browse_and_listen_hosts():
|
|
assert p('https://tidal.com/browse/track/434945950') == ('tidal', '434945950')
|
|
assert p('https://listen.tidal.com/track/434945950') == ('tidal', '434945950')
|
|
|
|
|
|
def test_qobuz_track_urls():
|
|
assert p('https://open.qobuz.com/track/12345678') == ('qobuz', '12345678')
|
|
assert p('https://play.qobuz.com/track/12345678') == ('qobuz', '12345678')
|
|
|
|
|
|
def test_scheme_less():
|
|
assert p('tidal.com/track/999') == ('tidal', '999')
|
|
|
|
|
|
def test_id_with_slug_suffix():
|
|
assert p('https://www.qobuz.com/track/555-some-slug') == ('qobuz', '555')
|
|
|
|
|
|
def test_non_track_links_rejected():
|
|
assert p('https://tidal.com/album/123') is None # album, not track
|
|
assert p('https://tidal.com/artist/123') is None
|
|
assert p('https://open.spotify.com/track/abc') is None # unsupported source
|
|
assert p('https://example.com/track/123') is None
|
|
|
|
|
|
def test_garbage_rejected():
|
|
assert p('') is None
|
|
assert p('just some text') is None
|
|
assert p('Habbit (T-Mass Remix)') is None
|
|
|
|
|
|
# ── query_from_track_payload (pure per-source parsing) ──
|
|
|
|
from core.downloads.track_link import query_from_track_payload as q
|
|
|
|
|
|
def test_tidal_payload_appends_version():
|
|
# Tidal attributes: title + version → remix link searches for the remix.
|
|
raw = {'title': 'Habbit', 'version': 'T-Mass Remix',
|
|
'artists': [{'name': 'Rain Man'}, {'name': 'Krysta Youngs'}]}
|
|
assert q('tidal', raw) == 'Rain Man Habbit (T-Mass Remix)'
|
|
|
|
|
|
def test_tidal_payload_no_version_no_artist():
|
|
assert q('tidal', {'title': 'Bloom'}) == 'Bloom'
|
|
|
|
|
|
def test_tidal_payload_singular_artist():
|
|
assert q('tidal', {'title': 'X', 'artist': {'name': 'Jinco'}}) == 'Jinco X'
|
|
|
|
|
|
def test_tidal_version_already_in_title_not_doubled():
|
|
raw = {'title': 'Bloom (Nurko Remix)', 'version': 'Nurko Remix',
|
|
'artists': [{'name': 'Dabin'}]}
|
|
assert q('tidal', raw) == 'Dabin Bloom (Nurko Remix)'
|
|
|
|
|
|
def test_qobuz_payload_performer():
|
|
raw = {'title': "What's Good For Me", 'performer': {'name': 'Jinco'}}
|
|
assert q('qobuz', raw) == "Jinco What's Good For Me"
|
|
|
|
|
|
def test_qobuz_payload_falls_back_to_album_artist():
|
|
raw = {'title': 'Song', 'album': {'artist': {'name': 'Some Artist'}}}
|
|
assert q('qobuz', raw) == 'Some Artist Song'
|
|
|
|
|
|
def test_payload_non_dict_or_empty():
|
|
assert q('tidal', None) is None
|
|
assert q('tidal', {}) is None
|
|
assert q('qobuz', 'garbage') is None
|
|
|
|
|
|
# ── bubble the pasted-link track to the top (#932) ──
|
|
|
|
from types import SimpleNamespace
|
|
|
|
from core.downloads.track_link import linked_track_id, bubble_linked_track_first
|
|
|
|
|
|
def _result(track_id=None):
|
|
"""Mimic a TrackResult: NO top-level `id`, the source id lives in
|
|
_source_metadata['track_id'] (or absent entirely)."""
|
|
meta = {'source': 'qobuz', 'track_id': track_id} if track_id is not None else None
|
|
return SimpleNamespace(_source_metadata=meta, title='t')
|
|
|
|
|
|
def test_linked_track_id_reads_source_metadata():
|
|
assert linked_track_id(_result('296427754')) == '296427754'
|
|
|
|
|
|
def test_linked_track_id_empty_when_absent():
|
|
# the exact #932 trap: there is no top-level `id`, so getattr(t,'id') would miss.
|
|
r = _result()
|
|
assert not hasattr(r, 'id')
|
|
assert linked_track_id(r) == ''
|
|
|
|
|
|
def test_bubble_floats_exact_track_to_top():
|
|
fuzzy_a, exact, fuzzy_b = _result('111'), _result('296427754'), _result('222')
|
|
out = bubble_linked_track_first([fuzzy_a, exact, fuzzy_b], '296427754')
|
|
assert out[0] is exact # exact track surfaced first
|
|
assert out[1:] == [fuzzy_a, fuzzy_b] # stable order for the rest
|
|
|
|
|
|
def test_bubble_handles_int_vs_str_id():
|
|
out = bubble_linked_track_first([_result('999'), _result('296427754')], 296427754)
|
|
assert linked_track_id(out[0]) == '296427754'
|
|
|
|
|
|
def test_bubble_noop_when_nothing_matches_or_empty():
|
|
a, b = _result('1'), _result('2')
|
|
assert bubble_linked_track_first([a, b], '296427754') == [a, b] # unchanged
|
|
assert bubble_linked_track_first([], '296427754') == []
|
|
assert bubble_linked_track_first([a, b], '') == [a, b]
|