vndangkhoa/kv-music
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: apply PR review comments - derive GEQ_FREQUENCIES, validate import, fix delete btn visibility, store preamp in presets

Browse source
This commit is contained in:
tryptz 2026-04-06 22:17:36 +00:00 committed by edideaur
parent 1a6214f3ea
commit 452b810efd
1 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
js/settings.js
View file

@ -1384,7 +1384,14 @@ export async function initializeSettings(scrobbler, player, api, ui) {
}); });
// Legacy EQ Import / Export // Legacy EQ Import / Export
const GEQ_FREQUENCIES = [25, 40, 63, 100, 160, 250, 400, 630, 1000, 1600, 2500, 4000, 6300, 10000, 16000, 20000]; const parseGeqLabelFrequency = (label) => {
const normalized = String(label).trim().toLowerCase().replace(/hz$/, '').trim();
if (normalized.endsWith('k')) {
return Number.parseFloat(normalized.slice(0, -1)) * 1000;
}
return Number.parseFloat(normalized);
};
const GEQ_FREQUENCIES = GEQ_LABELS.map((label) => parseGeqLabelFrequency(label));
const legacyGeqExportBtn = document.getElementById('legacy-geq-export-btn'); const legacyGeqExportBtn = document.getElementById('legacy-geq-export-btn');
const legacyGeqImportBtn = document.getElementById('legacy-geq-import-btn'); const legacyGeqImportBtn = document.getElementById('legacy-geq-import-btn');
const legacyGeqImportFile = document.getElementById('legacy-geq-import-file'); const legacyGeqImportFile = document.getElementById('legacy-geq-import-file');
@ -1441,19 +1448,25 @@ export async function initializeSettings(scrobbler, player, api, ui) {
if (importedPoints.length === 0) return; if (importedPoints.length === 0) return;
// Filter out invalid frequencies (0, negative, NaN, Infinity)
const validPoints = importedPoints.filter(
(p) => Number.isFinite(p.freq) && p.freq > 0 && Number.isFinite(p.gain)
);
if (validPoints.length === 0) return;
// Sort by frequency // Sort by frequency
importedPoints.sort((a, b) => a.freq - b.freq); validPoints.sort((a, b) => a.freq - b.freq);
// Map imported points to the 16 GEQ bands using nearest-frequency matching // Map imported points to the 16 GEQ bands using nearest-frequency matching
const newGains = GEQ_FREQUENCIES.map((targetFreq) => { const newGains = GEQ_FREQUENCIES.map((targetFreq) => {
// Find the closest imported point by log-frequency distance // Find the closest imported point by log-frequency distance
let closest = importedPoints[0]; let closest = validPoints[0];
let minDist = Math.abs(Math.log10(targetFreq) - Math.log10(closest.freq)); let minDist = Math.abs(Math.log10(targetFreq) - Math.log10(closest.freq));
for (let j = 1; j < importedPoints.length; j++) { for (let j = 1; j < validPoints.length; j++) {
const dist = Math.abs(Math.log10(targetFreq) - Math.log10(importedPoints[j].freq)); const dist = Math.abs(Math.log10(targetFreq) - Math.log10(validPoints[j].freq));
if (dist < minDist) { if (dist < minDist) {
minDist = dist; minDist = dist;
closest = importedPoints[j]; closest = validPoints[j];
} }
} }
// Clamp to slider range // Clamp to slider range
@ -1469,7 +1482,10 @@ export async function initializeSettings(scrobbler, player, api, ui) {
geqSyncAllSliders(); geqSyncAllSliders();
geqPreampSliders.forEach((s) => (s.value = geqPreamp)); geqPreampSliders.forEach((s) => (s.value = geqPreamp));
geqPreampValues.forEach((v) => (v.textContent = `${geqPreamp.toFixed(1)} dB`)); geqPreampValues.forEach((v) => (v.textContent = `${geqPreamp.toFixed(1)} dB`));
geqPresetSelects.forEach((s) => (s.value = '')); geqPresetSelects.forEach((s) => {
s.value = '';
s.dispatchEvent(new Event('change'));
});
} catch (err) { } catch (err) {
console.error('[Legacy GEQ Import] Failed:', err); console.error('[Legacy GEQ Import] Failed:', err);
} }
@ -1538,9 +1554,11 @@ export async function initializeSettings(scrobbler, player, api, ui) {
// Update the preset change handler to also handle custom presets // Update the preset change handler to also handle custom presets
geqPresetSelects.forEach((select) => { geqPresetSelects.forEach((select) => {
select.addEventListener('change', () => { select.addEventListener('change', () => {
updateDeleteBtnVisibility();
const key = select.value; const key = select.value;
if (!key) return; if (!key) {
updateDeleteBtnVisibility();
return;
}
// Check custom presets first // Check custom presets first
const customPresets = getLegacyGeqCustomPresets(); const customPresets = getLegacyGeqCustomPresets();
@ -1549,9 +1567,17 @@ export async function initializeSettings(scrobbler, player, api, ui) {
equalizerSettings.setGraphicEqGains(geqGains); equalizerSettings.setGraphicEqGains(geqGains);
audioContextManager.setGraphicEqAllGains(geqGains); audioContextManager.setGraphicEqAllGains(geqGains);
geqSyncAllSliders(); geqSyncAllSliders();
if (customPresets[key].preamp !== undefined) {
geqPreamp = customPresets[key].preamp;
equalizerSettings.setGraphicEqPreamp(geqPreamp);
audioContextManager.setGraphicEqPreamp(geqPreamp);
geqPreampSliders.forEach((s) => (s.value = geqPreamp));
geqPreampValues.forEach((v) => (v.textContent = `${geqPreamp.toFixed(1)} dB`));
}
geqPresetSelects.forEach((s) => { geqPresetSelects.forEach((s) => {
if (s !== select) s.value = key; if (s !== select) s.value = key;
}); });
updateDeleteBtnVisibility();
return; return;
} }
}); });
@ -1567,6 +1593,7 @@ export async function initializeSettings(scrobbler, player, api, ui) {
presets[id] = { presets[id] = {
name: sanitized, name: sanitized,
gains: geqGains.map((g) => Math.round(g * 10) / 10), gains: geqGains.map((g) => Math.round(g * 10) / 10),
preamp: Math.round(geqPreamp * 10) / 10,
}; };
saveLegacyGeqCustomPresets(presets); saveLegacyGeqCustomPresets(presets);
refreshLegacyGeqCustomPresetOptions(); refreshLegacyGeqCustomPresetOptions();