400b35d655
radoslav-orlov: add AAC as a download quality option. AAC is more efficient than MP3, so it's useful for Soulseek/torrents (streaming sources pick their own codec; Amazon — the AAC-heavy one — is down). Additive by construction: every quality tier already defaults enabled=false and the waterfall is built only from enabled tiers, so AAC ships OFF and the bucketer routes a not-enabled AAC file to the 'other' bucket EXACTLY as today (where it was silently dropped). Only a user who turns AAC on makes it a first-class tier, ranked above MP3 / below FLAC (priority 1.5, min-kbps gate so junk AAC can't beat a good MP3). - music_database: aac tier (disabled) in the default profile + all 3 presets. - soulseek_client: map .m4a -> 'aac' in both result parsers (was 'unknown' -> dropped); add the 'aac' bucket + a gated branch + a fallback size limit. - settings UI: an 'AAC' tier toggle (unchecked) between FLAC and MP3; save defaults its priority to 1.5 so upgraded profiles rank it right on first save. 7 seam tests pinning the additive guarantee (aac absent/disabled -> dropped as before; FLAC/MP3 selection unchanged; aac on -> selectable, below FLAC, above MP3); 81 quality/soulseek tests pass, ruff clean. quality_upgrade left untouched (its AAC handling is unchanged).
106 lines
4.4 KiB
Python
106 lines
4.4 KiB
Python
"""#886: AAC as an opt-in Soulseek quality tier.
|
|
|
|
The whole point is "purely additive": with AAC OFF (the default, and every
|
|
profile that predates this), an AAC candidate must behave EXACTLY as before —
|
|
it lands in the 'other' bucket, which the waterfall never returns, so it's
|
|
dropped. Only a profile that explicitly enables AAC makes it a selectable tier,
|
|
ranked above MP3 and below FLAC.
|
|
|
|
filter_results_by_quality_preference reads db.get_quality_profile() and walks the
|
|
buckets; we stub the db + the quarantine sweep so it runs offline.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import types
|
|
from pathlib import Path
|
|
from unittest.mock import patch
|
|
|
|
import pytest
|
|
|
|
from core.soulseek_client import SoulseekClient
|
|
from core.download_plugins.types import TrackResult
|
|
|
|
|
|
def _client():
|
|
c = SoulseekClient.__new__(SoulseekClient)
|
|
c.base_url = 'http://localhost:5030'
|
|
c.api_key = 'k'
|
|
c.download_path = Path('./test_downloads')
|
|
return c
|
|
|
|
|
|
def _cand(quality, size_mb, bitrate=None):
|
|
return TrackResult(
|
|
username='peer', filename=f'A/B/01 - Song.{quality}',
|
|
size=int(size_mb * 1024 * 1024), bitrate=bitrate, duration=None,
|
|
quality=quality, free_upload_slots=1, upload_speed=1_000_000,
|
|
queue_length=0, artist='A', title='Song', album='B', track_number=1)
|
|
|
|
|
|
def _q(enabled_flac=True, enabled_mp3=True, aac=None):
|
|
qualities = {
|
|
'flac': {'enabled': enabled_flac, 'min_kbps': 500, 'max_kbps': 10000, 'priority': 1, 'bit_depth': 'any'},
|
|
'mp3_320': {'enabled': enabled_mp3, 'min_kbps': 280, 'max_kbps': 500, 'priority': 2},
|
|
}
|
|
if aac is not None: # None => omit the tier entirely (pre-existing profile)
|
|
qualities['aac'] = {'enabled': aac, 'min_kbps': 128, 'max_kbps': 400, 'priority': 1.5}
|
|
return {'preset': 'custom', 'qualities': qualities, 'fallback_enabled': True}
|
|
|
|
|
|
def _filter(candidates, profile):
|
|
c = _client()
|
|
fake_db = types.SimpleNamespace(get_quality_profile=lambda: profile)
|
|
with patch('database.music_database.MusicDatabase', return_value=fake_db), \
|
|
patch.object(SoulseekClient, '_drop_quarantined_sources', lambda self, r: r):
|
|
return c.filter_results_by_quality_preference(candidates)
|
|
|
|
|
|
# ── additive proof: AAC off == today (dropped) ────────────────────────────────
|
|
def test_aac_dropped_when_tier_absent_pre_existing_profile():
|
|
# A profile saved before this feature has no 'aac' key at all.
|
|
out = _filter([_cand('aac', 5)], _q(aac=None))
|
|
assert out == [] # AAC went to 'other' -> never returned, exactly as before
|
|
|
|
|
|
def test_aac_dropped_when_tier_present_but_disabled():
|
|
out = _filter([_cand('aac', 5)], _q(aac=False))
|
|
assert out == []
|
|
|
|
|
|
def test_flac_mp3_selection_unchanged_when_aac_absent():
|
|
# The headline no-regression guard: a normal FLAC/MP3 mix is unaffected.
|
|
flac, mp3 = _cand('flac', 30), _cand('mp3', 5, bitrate=320)
|
|
out = _filter([mp3, flac], _q(aac=None))
|
|
assert out and out[0].quality == 'flac' # FLAC still wins, as before
|
|
|
|
|
|
# ── opt-in: AAC on makes it a real tier ───────────────────────────────────────
|
|
def test_aac_selected_when_enabled():
|
|
out = _filter([_cand('aac', 5)], _q(aac=True))
|
|
assert len(out) == 1 and out[0].quality == 'aac'
|
|
|
|
|
|
def test_flac_beats_aac_when_both_present():
|
|
flac, aac = _cand('flac', 30), _cand('aac', 5)
|
|
out = _filter([aac, flac], _q(aac=True))
|
|
assert out[0].quality == 'flac' # priority 1 < 1.5
|
|
|
|
|
|
def test_aac_beats_mp3_when_both_present():
|
|
mp3, aac = _cand('mp3', 5, bitrate=320), _cand('aac', 5)
|
|
out = _filter([mp3, aac], _q(aac=True))
|
|
assert out[0].quality == 'aac' # priority 1.5 < 2
|
|
|
|
|
|
def test_default_and_presets_ship_aac_disabled_above_mp3():
|
|
from database.music_database import MusicDatabase
|
|
db = MusicDatabase.__new__(MusicDatabase) # no DB init
|
|
profiles = [db._get_default_quality_profile()]
|
|
profiles += [db.get_quality_preset(p) for p in ('audiophile', 'balanced', 'space_saver')]
|
|
for prof in profiles:
|
|
aac = prof['qualities']['aac']
|
|
assert aac['enabled'] is False # opt-in everywhere
|
|
# above MP3: lower priority number than the best MP3 tier present
|
|
mp3_prios = [v['priority'] for k, v in prof['qualities'].items() if k.startswith('mp3')]
|
|
assert aac['priority'] < min(mp3_prios)
|