diff --git a/.gitignore b/.gitignore
index 273ed13..e430177 100644
Binary files a/.gitignore and b/.gitignore differ
diff --git a/public/js/config.js b/public/js/config.js
index c9c460d..9132916 100644
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -2,6 +2,6 @@
// 其余配置由服务端在运行时动态注入 (环境变量 > config.js > defaultConfig.ts)
// 服务端拦截 /js/config.js 请求, 读取此处版本号并合并服务端配置后返回
window.CONFIG = {
- buildHash: 'c95106b',
+ buildHash: 'ba6046e',
version: 'v1.9.4',
};
diff --git a/public/music/app.js b/public/music/app.js
index e742287..20ad1c2 100644
--- a/public/music/app.js
+++ b/public/music/app.js
@@ -73,15 +73,15 @@ const DEFAULT_SETTINGS = {
enableAutoProxy: true, // 自动代理
enableCustomProxy: false, // 是否启用自定义代理
customProxyUrl: '', // 自定义代理URL模板，使用 {url} 作为原始URL占位符
- enableOnlyDownloadMode: false, // 仅下载模式
- downloadConcurrency: 3, // 缓存并发量 (1-6)
+ enableOnlyDownloadMode: true, // 仅下载模式
+ downloadConcurrency: 3, // 缓存并发量 (1-5)
hotSearchLimit: 20, // 热搜显示数量
lyricFontSize: 1.25, // 歌词字体大小 (rem)
lyricFontFamily: '', // 词字体
switchPlaylistOnSearchPlay: true, // 播放搜索歌曲时切换歌单 (默认开启)
switchPlaylistOnSongListPlay: true, // 播放歌单/排行榜歌曲时切换歌单 (默认开启)
autoResume: true, // 自动恢复进度 (默认开启)
- showSidebarSongInfo: true, // 展示侧边栏封面
+ showSidebarSongInfo: false, // 展示侧边栏封面
enableCrossfade: true, // 音频淡入淡出
keepScreenAwake: true, // 保持屏幕唤醒设置
enableKeyboardShortcuts: true, // 按键快捷方式 (默认开启)
@@ -116,6 +116,8 @@ const DEFAULT_SETTINGS = {
playerBackground: 'blur', // 播放页背景: 'blur', 'solid', 'dark'
saveAccountSettingsToFile: true, // 同步账号设置到文件 (默认开启)
autoUpdateNetworkList: false, // 自动更新网络歌单 (默认关闭)
+ networkListAutoCheckInterval: '6h', // 网络歌单自动检测间隔
+ favoriteSidebarOrder: [], // 我的收藏侧边栏子项排序
preferServerCache: true, // 优先播放缓存歌曲 (默认开启)
remoteSyncUrl: '', // 远程同步地址
remoteSyncCode: '', // 远程同步连接码
@@ -124,6 +126,20 @@ const DEFAULT_SETTINGS = {
deduplicatePlaylistByQuality: true, // 同 ID 歌曲仅加入最高音质 (默认开启)
};
+function normalizeDownloadConcurrency(value) {
+ const parsed = parseInt(value, 10);
+ if (!Number.isFinite(parsed)) return DEFAULT_SETTINGS.downloadConcurrency;
+ return Math.min(5, Math.max(1, parsed));
+}
+
+function normalizeStoredSettings(nextSettings) {
+ if (!nextSettings || typeof nextSettings !== 'object') return nextSettings;
+ if (nextSettings.downloadConcurrency !== undefined) {
+ nextSettings.downloadConcurrency = normalizeDownloadConcurrency(nextSettings.downloadConcurrency);
+ }
+ return nextSettings;
+}
+
let settings = { ...DEFAULT_SETTINGS };
// 歌词原始数据，用于设置切换时重新渲染
@@ -139,20 +155,139 @@ let currentRecoveryState = null; // 播放失败自动恢复状态管理
try {
const saved = localStorage.getItem('lx_settings');
if (saved) {
- settings = { ...settings, ...JSON.parse(saved) };
+ settings = normalizeStoredSettings({ ...settings, ...JSON.parse(saved) });
}
} catch (e) {
console.error('[Settings] 加载设置失败:', e);
}
window.settings = settings; // 显式挂载到 window
+window.networkListUpdateMap = new Set();
+let networkListAutoCheckTimer = null;
+
+function escapeHtmlText(value) {
+ return String(value ?? '').replace(/[&<>"']/g, ch => ({
+ '&': '&',
+ '<': '<',
+ '>': '>',
+ '"': '"',
+ "'": '''
+ })[ch]);
+}
+
+function parseNetworkListAutoCheckInterval(value) {
+ const minIntervalMs = 30 * 1000;
+ if (value === undefined || value === null) return 0;
+ const raw = String(value).trim().toLowerCase();
+ if (raw === '' || raw === '0' || raw === 'off' || raw === 'none' || raw === 'disable') return 0;
+ const matched = raw.match(/^(\d+(?:\.\d+)?)(ms|s|m|h|d)?$/);
+ if (!matched) return null;
+ const count = parseFloat(matched[1]);
+ const unit = matched[2] || 'h';
+ if (!Number.isFinite(count) || count < 0) return null;
+ let intervalMs = null;
+ switch (unit) {
+ case 'ms': intervalMs = count; break;
+ case 's': intervalMs = count * 1000; break;
+ case 'm': intervalMs = count * 60 * 1000; break;
+ case 'h': intervalMs = count * 60 * 60 * 1000; break;
+ case 'd': intervalMs = count * 24 * 60 * 60 * 1000; break;
+ default: return null;
+ }
+ return Math.max(intervalMs, minIntervalMs);
+}
+
+function setupNetworkListAutoCheck() {
+ if (networkListAutoCheckTimer) {
+ clearInterval(networkListAutoCheckTimer);
+ networkListAutoCheckTimer = null;
+ }
+ if (!settings.autoUpdateNetworkList) {
+ return;
+ }
+ const intervalMs = parseNetworkListAutoCheckInterval(settings.networkListAutoCheckInterval);
+ if (intervalMs === null || intervalMs <= 0) {
+ return;
+ }
+ networkListAutoCheckTimer = setInterval(() => {
+ checkNetworkListUpdates().catch(err => console.error('[AutoCheck] 网络歌单检测失败:', err));
+ }, intervalMs);
+ console.log('[AutoCheck] 已设置网络歌单自动检测间隔：', settings.networkListAutoCheckInterval, '(', intervalMs, 'ms )');
+}
+
+async function checkNetworkListUpdates(manual = false) {
+ if (!currentListData || !Array.isArray(currentListData.userList) || currentListData.userList.length === 0) {
+ if (manual && window.showToast) showToast('info', '当前没有可检查的网络歌单', 3000);
+ return;
+ }
+
+ const targetLists = currentListData.userList.filter(l => l && l.sourceListId && l.source);
+ if (targetLists.length === 0) {
+ if (manual && window.showToast) showToast('info', '当前没有可检查的网络歌单', 3000);
+ return;
+ }
+
+ const changedLists = [];
+ const failedLists = [];
+
+ for (const list of targetLists) {
+ try {
+ const url = `${API_BASE}/songList/detail?source=${encodeURIComponent(list.source)}&id=${encodeURIComponent(list.sourceListId)}&page=1`;
+ const res = await fetch(url);
+ const data = await res.json();
+ if (!data || !Array.isArray(data.list)) {
+ throw new Error('远端歌单数据不完整');
+ }
+
+ const remoteList = data.list.map(item => {
+ const formatted = formatSongToLxMusicStandard(item);
+ if (!formatted.source) formatted.source = list.source;
+ return formatted;
+ });
+
+ const localList = Array.isArray(list.list) ? list.list : [];
+ const sameLength = localList.length === remoteList.length;
+ const sameIds = sameLength && localList.every((item, index) => item && remoteList[index] && String(item.id || '') === String(remoteList[index].id || '') && String(item.source || '') === String(remoteList[index].source || ''));
+ if (!sameIds) {
+ window.networkListUpdateMap.add(list.id);
+ changedLists.push(list.name || list.id || list.sourceListId);
+ } else {
+ window.networkListUpdateMap.delete(list.id);
+ }
+ } catch (err) {
+ console.error('[CheckNetworkListUpdates] 检查失败:', list.name || list.id || list.sourceListId, err);
+ failedLists.push(list.name || list.id || list.sourceListId);
+ }
+ }
+
+ if (typeof renderMyLists === 'function') {
+ renderMyLists(currentListData);
+ }
+
+ if (manual) {
+ const changedListNames = changedLists.map(escapeHtmlText);
+ const failedListNames = failedLists.map(escapeHtmlText);
+ if (changedLists.length > 0) {
+ showSuccess(`检测到 ${changedLists.length} 个歌单已更新：${changedListNames.join('、')}`);
+ } else if (failedLists.length === 0) {
+ showSuccess('所有网络歌单均为最新状态');
+ }
+ if (failedLists.length > 0) {
+ showError(`部分歌单检测失败：${failedListNames.join('、')}`);
+ }
+ } else if (changedLists.length > 0 && window.showToast) {
+ showToast('info', `检测到 ${changedLists.length} 个网络歌单有更新`, 5000);
+ }
+}
+
+window.checkNetworkListUpdates = checkNetworkListUpdates;
// Initial Sync for Server Cache Config
setTimeout(() => {
if (settings.serverCacheLocation && window.updateServerCacheConfig) {
- console.log('[ServerCache] Syncing config:', settings.serverCacheLocation);
- window.updateServerCacheConfig(settings.serverCacheLocation);
+ console.log('[ServerCache] Syncing config:', settings.serverCacheLocation, settings.serverCacheNamingPattern);
+ window.updateServerCacheConfig(settings.serverCacheLocation, settings.serverCacheNamingPattern);
}
}, 2000);
@@ -606,16 +741,17 @@ function changeQualityPreference(quality) {
// Tab Switching
function switchTab(tabId) {
+ // Favorites is a sidebar group toggle, not a main content view.
+ if (tabId === 'favorites') {
+ handleFavoritesClick();
+ return;
+ }
+
document.querySelectorAll('[id^="view-"]').forEach(el => {
el.classList.add('hidden');
el.classList.remove('opacity-100');
el.classList.add('opacity-0');
});
- // special handling for favorites
- if (tabId === 'favorites' && currentListData) {
- handleFavoritesClick();
- return;
- }
const activeView = document.getElementById(`view-${tabId}`);
if (!activeView) return;
@@ -1477,30 +1613,36 @@ function getQualityTags(item) {
let has320 = false;
let hasFlac = false;
let hasHiRes = false;
+ let hasAtmos = false;
let hasMaster = false;
if (Array.isArray(rawTypes)) {
+ const isConcrete = t => !(t && t.isPlatformQuality);
has320 = rawTypes.some(t => t.type === '320k');
hasFlac = rawTypes.some(t => t.type === 'flac');
- hasHiRes = rawTypes.some(t => t.type === 'flac24bit');
- hasMaster = rawTypes.some(t => t.type === 'master');
+ hasHiRes = rawTypes.some(t => (t.type === 'flac24bit' || t.type === 'hires') && isConcrete(t));
+ hasAtmos = rawTypes.some(t => (t.type === 'atmos' || t.type === 'atmos_plus') && isConcrete(t));
+ hasMaster = rawTypes.some(t => t.type === 'master' && isConcrete(t));
} else {
has320 = !!rawTypes['320k'];
hasFlac = !!rawTypes['flac'];
- hasHiRes = !!rawTypes['flac24bit'];
- hasMaster = !!rawTypes['master'];
+ hasHiRes = !!(rawTypes['flac24bit'] && !rawTypes['flac24bit'].isPlatformQuality) || !!(rawTypes.hires && !rawTypes.hires.isPlatformQuality);
+ hasAtmos = !!(rawTypes.atmos && !rawTypes.atmos.isPlatformQuality) || !!(rawTypes.atmos_plus && !rawTypes.atmos_plus.isPlatformQuality);
+ hasMaster = !!(rawTypes.master && !rawTypes.master.isPlatformQuality);
}
// [New] 额外检查具体音质字段 (适用于本地歌曲或已确定音质的播放中歌曲)
const q = item.quality || item.type;
if (q) {
if (q === 'master') hasMaster = true;
- else if (q === 'flac24bit') hasHiRes = true;
+ else if (q === 'atmos' || q === 'atmos_plus') hasAtmos = true;
+ else if (q === 'flac24bit' || q === 'hires') hasHiRes = true;
else if (q === 'flac') hasFlac = true;
else if (q === '320k') has320 = true;
}
if (hasMaster) tags.push('Master');
+ else if (hasAtmos) tags.push('Atmos');
else if (hasHiRes) tags.push('Hi-Res');
else if (hasFlac) tags.push('无损');
else if (has320) tags.push('高品质');
@@ -1632,6 +1774,9 @@ window.searchBySinger = searchBySinger;
let currentArtistId = null;
let currentArtistSource = 'wy';
let currentArtistInfo = null;
+window.currentArtistId = null;
+window.currentArtistSource = 'wy';
+window.currentArtistOrder = 'hot';
async function enterArtist(id, source = 'wy', order = 'hot', tab = 'songs', isBack = false) {
const typeEl = document.getElementById('search-type');
@@ -1644,14 +1789,30 @@ async function enterArtist(id, source = 'wy', order = 'hot', tab = 'songs', isBa
window.history.pushState({ page: 'search-detail' }, '');
}
+ const previousArtistOrder = window.currentArtistOrder || 'hot';
+ const isDifferentArtist = String(currentArtistId || '') !== String(id) || currentArtistSource !== source;
+ const isDifferentOrder = previousArtistOrder !== order;
+ if (isDifferentArtist || (tab === 'songs' && isDifferentOrder)) {
+ window.currentArtistSongsCache = null;
+ window.artistSongsPage = 1;
+ if (window.ListSearch) window.ListSearch.resetState();
+ }
+ if (isDifferentArtist) {
+ window.currentArtistAlbumsCache = null;
+ }
+
currentArtistId = id;
+ currentArtistSource = source;
+ window.currentArtistId = id;
+ window.currentArtistSource = source;
+ window.currentArtistOrder = order;
window.currentArtistTab = tab;
const resultsContainer = document.getElementById('search-results');
const header = document.getElementById('search-results-header');
if (header) header.classList.add('hidden');
// 只有在没有缓存或者 ID 变化时才获取详情
- if (!currentArtistInfo || currentArtistInfo.id != id) {
+ if (!currentArtistInfo || String(currentArtistInfo.id) !== String(id) || currentArtistInfo.source !== source) {
// 如果还没有头部，显示加载
if (!document.getElementById('artist-detail-header')) {
resultsContainer.innerHTML = '
';
@@ -1875,11 +2036,19 @@ async function loadArtistSongs(id, source, order, forceFetch = false) {
return;
}
+ renderArtistSongsLoading();
+
try {
const res = await fetch(`${API_BASE}/artistSongs?id=${id}&source=${source}&order=${order}`);
if (!res.ok) throw new Error('Failed to fetch songs');
const list = await res.json();
+ const isCurrentRequest = String(window.currentArtistId) === String(id)
+ && window.currentArtistSource === source
+ && window.currentArtistOrder === order
+ && window.currentArtistTab === 'songs';
+ if (!isCurrentRequest) return;
+
// [Fix] 唯一 ID
list.forEach((item, idx) => {
if (!item.id || item.id === 'undefined') {
@@ -1901,6 +2070,18 @@ async function loadArtistSongs(id, source, order, forceFetch = false) {
}
}
+function renderArtistSongsLoading() {
+ const content = document.getElementById('artist-detail-content');
+ if (!content) return;
+ window.viewingPlaylist = [];
+ content.innerHTML = `
+
+
+ 正在加载歌曲...
+
+ `;
+}
+
function renderArtistSongsUI(list, page) {
const content = document.getElementById('artist-detail-content');
if (!content) return;
@@ -2068,27 +2249,97 @@ function artistSongsNextPage() {
window.artistSongsPrevPage = artistSongsPrevPage;
window.artistSongsNextPage = artistSongsNextPage;
+const ARTIST_ALBUM_PAGE_SIZE = 50;
+const ARTIST_ALBUM_MAX_PAGES = 100;
+
+function renderArtistAlbumsLoading(loaded = 0, total = 0) {
+ const content = document.getElementById('artist-detail-content');
+ if (!content) return;
+ const progressText = loaded > 0
+ ? '正在加载全部专辑，已读取 ' + loaded + (total > 0 ? '/' + total : '') + ' 张...'
+ : '正在加载全部专辑...';
+ const wrapper = document.createElement('div');
+ const icon = document.createElement('i');
+ const label = document.createElement('span');
+ wrapper.className = 'flex items-center justify-center py-12 t-text-muted';
+ icon.className = 'fas fa-spinner fa-spin text-2xl text-emerald-500 mr-3';
+ label.className = 'text-sm font-medium';
+ label.textContent = progressText;
+ wrapper.append(icon, label);
+ content.replaceChildren(wrapper);
+}
+
+async function fetchAllArtistAlbums(id, source, signal, onProgress) {
+ const albums = [];
+ const albumKeys = new Set();
+ let total = 0;
+
+ for (let page = 1; page <= ARTIST_ALBUM_MAX_PAGES; page++) {
+ const query = new URLSearchParams({ id: String(id), source, page: String(page) });
+ const res = await fetch(API_BASE + '/artistAlbums?' + query.toString(), { signal });
+ if (!res.ok) throw new Error('Failed to fetch artist albums page ' + page);
+
+ const data = await res.json();
+ const pageList = Array.isArray(data.list) ? data.list : [];
+ const previousCount = albums.length;
+ total = Math.max(total, Number(data.total) || 0);
+
+ pageList.forEach((album, index) => {
+ const albumId = album.id ?? album.mid;
+ const key = albumId !== undefined && albumId !== null && albumId !== ''
+ ? source + ':' + albumId
+ : source + ':page:' + page + ':index:' + index;
+ if (albumKeys.has(key)) return;
+ albumKeys.add(key);
+ albums.push({ ...album, source: album.source || source });
+ });
+
+ if (typeof onProgress === 'function') onProgress(albums.length, total);
+
+ const reachedTotal = total > 0 && albums.length >= total;
+ const pageExhausted = pageList.length < ARTIST_ALBUM_PAGE_SIZE;
+ const noNewAlbums = albums.length === previousCount;
+ if (pageList.length === 0 || reachedTotal || pageExhausted || noNewAlbums) break;
+ }
+
+ return { list: albums, total: total || albums.length };
+}
+
async function loadArtistAlbums(id, source, forceFetch = false) {
- if (!forceFetch && window.currentArtistAlbumsCache && window.currentArtistId === id && window.currentArtistSource === source) {
+ if (!forceFetch && window.currentArtistAlbumsCache && String(window.currentArtistId) === String(id) && window.currentArtistSource === source) {
renderArtistAlbumsUI(window.currentArtistAlbumsCache);
return;
}
+ renderArtistAlbumsLoading();
+
try {
- const res = await fetch(`${API_BASE}/artistAlbums?id=${id}&source=${source}`);
- if (!res.ok) throw new Error('Failed to fetch albums');
- const data = await res.json();
- const list = data.list || [];
+ const data = await fetchAllArtistAlbums(id, source, undefined, (loaded, total) => {
+ const stillViewingArtist = String(window.currentArtistId) === String(id) && window.currentArtistSource === source;
+ if (window.currentArtistTab === 'albums' && stillViewingArtist) {
+ renderArtistAlbumsLoading(loaded, total);
+ }
+ });
+ const list = data.list;
+ const stillViewingArtist = String(window.currentArtistId) === String(id) && window.currentArtistSource === source;
+ if (!stillViewingArtist) return;
window.currentArtistAlbumsCache = list;
- window.currentArtistId = id;
+ window.currentArtistAlbumsTotal = data.total;
- renderArtistAlbumsUI(list);
+ if (window.currentArtistTab === 'albums') {
+ renderArtistAlbumsUI(list);
+ }
} catch (e) {
- showError(`加载专辑失败: ${e.message}`);
- goBackToSearch();
+ const stillViewingArtist = String(window.currentArtistId) === String(id) && window.currentArtistSource === source;
+ if (stillViewingArtist) {
+ showError(`加载专辑失败: ${e.message}`);
+ goBackToSearch();
+ } else {
+ console.warn('[ArtistAlbums] 已离开歌手页，忽略专辑加载失败:', e);
+ }
}
}
@@ -2101,13 +2352,18 @@ function renderArtistAlbumsUI(list) {
return;
}
- let html = `
+ const artistName = currentArtistInfo?.name || '';
+ const html = `
- ${list.map(album => `
-
+ ${list.map((album, index) => {
+ const albumId = album.id ?? album.mid;
+ const albumSource = album.source || window.currentArtistSource || 'wy';
+ const albumName = album.name || '未知专辑';
+ const favorited = isAlbumFavorited(albumId, albumSource);
+ return `
+
-
@@ -2115,20 +2371,107 @@ function renderArtistAlbumsUI(list) {
+
+
+
+
-
${album.name}
+
${escapeHtmlText(albumName)}
- ${album.publishTime}
- ${album.total} 首
+ ${escapeHtmlText(album.publishTime || '')}
+ ${album.total ?? album.count ?? album.size ?? album.songCount ?? 0} 首
- `).join('')}
+ `;
+ }).join('')}
${text}
`;
+ const safeText = escapeHtmlText(text);
+ return `${safeText}
`;
}
//滚动显示
-function applyMarqueeChecks() {
+function applyMarqueeChecks(root = document) {
// Wait for render
setTimeout(() => {
- const elements = document.querySelectorAll('.dynamic-marquee.truncate');
+ const scope = root || document;
+ const elements = scope.querySelectorAll('.dynamic-marquee.truncate');
elements.forEach(el => {
if (el.scrollWidth > el.clientWidth) {
const text = el.getAttribute('data-text') || el.innerText;
- const gap = ''; // 增加间距
// 必须保留 overflow-hidden 以限制宽度
el.classList.remove('truncate');
@@ -2495,12 +2839,22 @@ function applyMarqueeChecks() {
// 使用 mask-image 实现边缘渐隐效果
const maskStyle = 'mask-image: linear-gradient(to right, transparent 0%, black 5%, black 95%, transparent 100%); -webkit-mask-image: linear-gradient(to right, transparent 0%, black 5%, black 95%, transparent 100%);';
- el.innerHTML = `
-
-
- ${text}${gap}${text}${gap}
-
-
+
+
+
+
${item.name}
@@ -7257,12 +7777,12 @@ function renderLibraryAlbums(list) {
${item.list && item.list.length ? `(${item.list.length} 首)` : ''}
${getSourceTag ? getSourceTag(item.source) : ''}
-
- `;
+ `;
+ const downloadButton = div.querySelector('.lib-album-download-btn');
+ downloadButton?.addEventListener('click', async event => {
+ event.stopPropagation();
+ await downloadArtistAlbumSongs(item, downloadButton);
+ });
grid.appendChild(div);
});
}
@@ -7608,11 +8128,12 @@ async function fetchSettingsFromServer() {
const serverSettings = await res.json();
console.log('[Settings] 从服务器加载设置成功:', serverSettings);
// Merge settings
- settings = { ...settings, ...serverSettings };
+ settings = normalizeStoredSettings({ ...settings, ...serverSettings });
// Save to local
localStorage.setItem('lx_settings', JSON.stringify(settings));
// Update UI
syncSettingsUI();
+ setupNetworkListAutoCheck();
if (typeof showSuccess === 'function') {
showSuccess('已从服务器恢复设置');
}
@@ -8167,11 +8688,90 @@ async function handleRemoteOverwriteConnect(silent = false) {
}
+function getFavoriteSidebarOrder() {
+ return Array.isArray(settings.favoriteSidebarOrder) ? settings.favoriteSidebarOrder : [];
+}
+
+function getOrderedFavoriteSidebarItems(items) {
+ const order = getFavoriteSidebarOrder();
+ if (!order.length) return items;
+
+ const itemMap = new Map(items.map(item => [item.id, item]));
+ const orderedItems = [];
+ order.forEach(id => {
+ const item = itemMap.get(id);
+ if (!item) return;
+ orderedItems.push(item);
+ itemMap.delete(id);
+ });
+ return [...orderedItems, ...itemMap.values()];
+}
+
+function persistFavoriteSidebarOrder(ids) {
+ settings.favoriteSidebarOrder = ids;
+ window.settings = settings;
+ try {
+ localStorage.setItem('lx_settings', JSON.stringify(settings));
+ } catch (e) {
+ console.error('[Settings] 保存收藏侧边栏排序失败:', e);
+ }
+ if (settings.saveAccountSettingsToFile) {
+ pushSettingsToServer();
+ }
+}
+
+async function persistUserListOrderFromSidebar(ids) {
+ if (!currentListData || !Array.isArray(currentListData.userList)) return;
+
+ const currentUserIds = currentListData.userList.map(list => list.id);
+ const userOrder = ids.filter(id => currentUserIds.includes(id));
+ if (userOrder.length !== currentUserIds.length) return;
+ if (userOrder.every((id, index) => id === currentUserIds[index])) return;
+
+ const listMap = new Map(currentListData.userList.map(list => [list.id, list]));
+ currentListData.userList = userOrder.map(id => listMap.get(id)).filter(Boolean);
+ try {
+ await pushDataChange();
+ } catch (e) {
+ console.error('[Playlist] 保存歌单排序失败:', e);
+ showError('保存歌单排序失败，请稍后重试');
+ }
+}
+
+function initFavoriteSidebarSortable(container) {
+ if (typeof Sortable === 'undefined' || !container) return;
+
+ try {
+ const oldSortable = Sortable.get(container);
+ if (oldSortable) oldSortable.destroy();
+ } catch (e) {
+ console.warn('[Playlist] 重置侧边栏排序失败:', e);
+ }
+
+ Sortable.create(container, {
+ animation: 150,
+ handle: '.favorite-sidebar-drag-handle',
+ ghostClass: 'opacity-50',
+ chosenClass: 'bg-emerald-50',
+ onEnd: () => {
+ const ids = Array.from(container.querySelectorAll('[data-sidebar-sort-id]'))
+ .map(el => el.getAttribute('data-sidebar-sort-id'))
+ .filter(Boolean);
+ persistFavoriteSidebarOrder(ids);
+ persistUserListOrderFromSidebar(ids);
+ }
+ });
+}
+
function renderMyLists(data) {
const container = document.getElementById('my-lists-container');
container.innerHTML = '';
- if (!data) return;
+ if (!data) {
+ container.innerHTML = '请先在设置中登录
';
+ refreshFavoritesChildrenHeight();
+ return;
+ }
// Helper to create list item
const createItem = (listObj, name, icon, count) => {
@@ -8179,6 +8779,7 @@ function renderMyLists(data) {
const div = document.createElement('div');
div.className = "px-6 py-2 text-sm t-text-muted hover:t-bg-main cursor-pointer flex items-center group transition-colors overflow-hidden";
div.setAttribute('data-sidebar-list-id', id);
+ div.setAttribute('data-sidebar-sort-id', id);
div.onclick = () => handleListClick(id);
// Use createMarqueeHtml for list name
@@ -8188,6 +8789,9 @@ function renderMyLists(data) {
const showExternalOps = listObj && listObj.sourceListId && listObj.source;
let opsHtml = '';
if (showExternalOps) {
+ const updateBadge = window.networkListUpdateMap && window.networkListUpdateMap.has(id)
+ ? `!`
+ : '';
opsHtml = `
+ ${updateBadge}
`;
}
div.innerHTML = `
+
+
+
${opsHtml}
${name.length > 8 ? `${nameHtml}
` : nameHtml}
@@ -8213,35 +8821,41 @@ function renderMyLists(data) {
const div = document.createElement('div');
div.className = "px-6 py-2 text-sm t-text-muted hover:t-bg-main cursor-pointer flex items-center group transition-colors overflow-hidden";
div.setAttribute('data-sidebar-list-id', id);
+ div.setAttribute('data-sidebar-sort-id', id);
div.onclick = clickFn;
div.innerHTML = `
+
+
+
${name}
0
`;
return div;
};
- container.appendChild(createLibItem('__lib_artists__', '收藏歌手', 'fa-user', 'lib-artist-count', handleArtistLibraryClick));
- container.appendChild(createLibItem('__lib_albums__', '收藏专辑', 'fa-compact-disc', 'lib-album-count', handleAlbumLibraryClick));
- // 立即更新数量
- refreshLibrarySidebarCount();
+ const sidebarItems = [
+ { id: '__lib_artists__', type: 'lib', el: createLibItem('__lib_artists__', '收藏歌手', 'fa-user', 'lib-artist-count', handleArtistLibraryClick) },
+ { id: '__lib_albums__', type: 'lib', el: createLibItem('__lib_albums__', '收藏专辑', 'fa-compact-disc', 'lib-album-count', handleAlbumLibraryClick) }
+ ];
- // Default List
if (data.defaultList) {
- container.appendChild(createItem('default', '默认列表', 'fa-list', data.defaultList.length));
+ sidebarItems.push({ id: 'default', type: 'system', el: createItem('default', '默认列表', 'fa-list', data.defaultList.length) });
}
- // Love List
if (data.loveList) {
- container.appendChild(createItem('love', '我的收藏', 'fa-heart', data.loveList.length));
+ sidebarItems.push({ id: 'love', type: 'system', el: createItem('love', '我的收藏', 'fa-heart', data.loveList.length) });
}
- // User Lists
if (data.userList) {
data.userList.forEach(l => {
const listLen = l.list ? l.list.length : 0;
- container.appendChild(createItem(l, l.name, 'fa-music', listLen));
+ sidebarItems.push({ id: l.id, type: 'user', el: createItem(l, l.name, 'fa-music', listLen) });
});
}
+ getOrderedFavoriteSidebarItems(sidebarItems).forEach(item => container.appendChild(item.el));
+ refreshLibrarySidebarCount();
+ initFavoriteSidebarSortable(container);
+ refreshFavoritesChildrenHeight();
+
// [Resume] 处理本地列表的自动恢复跳转
if (window._pendingResumeListId) {
const listId = window._pendingResumeListId;
@@ -8257,6 +8871,14 @@ function handleListClick(listId, skipAutoUpdate = false) {
if (!currentListData) return;
+ if (!skipAutoUpdate) {
+ // Selections belong to the previously rendered list. Keeping them here makes
+ // the toolbar count include invisible songs after opening another favorite list.
+ window.selectedItems?.clear();
+ window.selectedSongObjects?.clear();
+ if (typeof updateBatchToolbar === 'function') updateBatchToolbar();
+ }
+
// Mobile: Close sidebar when a list is selected
if (window.innerWidth < 1025) {
const sidebar = document.getElementById('main-sidebar');
@@ -8347,23 +8969,6 @@ function handleListClick(listId, skipAutoUpdate = false) {
function handleFavoritesClick() {
exitListSecondaryModes();
- toggleFavorites(); // Toggle folder dropdown in sidebar
-
- // [New] 为全局收藏视图初始化搜索状态
- initGlobalListSearch();
-
- if (!currentListData) {
- // Not logged in, switch to the guidance view directly
- switchTab('favorites');
- document.getElementById('page-title').innerText = "我的收藏";
- return;
- }
-
- // Switch to Search View (Global Local)
- document.querySelectorAll('[id^="view-"]').forEach(el => el.classList.add('hidden'));
- const activeView = document.getElementById('view-search');
- activeView.classList.remove('hidden');
- setTimeout(() => activeView.classList.remove('opacity-0'), 10); // Simple fade
// Highlight Header
document.querySelectorAll('[id^="tab-"]').forEach(el => {
@@ -8376,47 +8981,7 @@ function handleFavoritesClick() {
favTab.classList.remove('t-text-muted');
}
- // Always clear sub-item highlight when switching to "All Favorites"
- document.querySelectorAll('[data-sidebar-list-id]').forEach(el => {
- el.classList.remove('active-sub-item');
- el.classList.add('t-text-muted');
- });
-
- // UI Updates
- document.getElementById('page-title').innerText = "我的收藏 (全部)";
- document.getElementById('search-input').value = '';
- document.getElementById('search-input').placeholder = "搜索所有收藏...";
- document.getElementById('search-source').classList.add('hidden');
- document.getElementById('search-type').classList.add('hidden');
-
- // Set Scope
- currentSearchScope = 'local_all';
-
- // Collect all songs from Default, Love, and User Lists
- let allSongs = [];
- if (currentListData) {
- if (currentListData.defaultList) allSongs = allSongs.concat(currentListData.defaultList);
- if (currentListData.loveList) allSongs = allSongs.concat(currentListData.loveList);
- if (currentListData.userList) {
- currentListData.userList.forEach(l => {
- if (l.list) allSongs = allSongs.concat(l.list);
- });
- }
- }
-
- // Deduplicate by song ID
- const uniqueSongs = [];
- const seenIds = new Set();
- allSongs.forEach(s => {
- if (s && s.id && !seenIds.has(s.id)) {
- seenIds.add(s.id);
- uniqueSongs.push(s);
- }
- });
-
- // Update render
- currentPage = 1;
- renderResults(uniqueSongs);
+ toggleFavorites();
}
async function handleCreateList() {
@@ -8635,7 +9200,8 @@ async function handleRefreshList(listId, event, silent = false) {
}
if (!silent) {
- const confirmed = await showSelect('更新歌单', `是否更新当前歌单 "${list.name}"？\n(确认后将重新从服务器拉取歌单并覆盖当前内容)`, {
+ const safeListName = escapeHtmlText(list.name || list.id || list.sourceListId || '');
+ const confirmed = await showSelect('更新歌单', `是否更新当前歌单 "${safeListName}"？\n(确认后将重新从服务器拉取歌单并覆盖当前内容)`, {
confirmText: '确定更新',
confirmColor: 'bg-emerald-500'
});
@@ -8646,7 +9212,7 @@ async function handleRefreshList(listId, event, silent = false) {
if (window.showToast) window.showToast('info', '正在同步最新歌单内容...');
try {
- const url = `${API_BASE}/songList/detail?source=${list.source}&id=${encodeURIComponent(list.sourceListId)}&page=1`;
+ const url = `${API_BASE}/songList/detail?source=${encodeURIComponent(list.source)}&id=${encodeURIComponent(list.sourceListId)}&page=1`;
const res = await fetch(url);
const data = await res.json();
@@ -8666,6 +9232,11 @@ async function handleRefreshList(listId, event, silent = false) {
if (data.info.img || data.info.pic) list.Album = data.info.img || data.info.pic;
}
+ // 清除该列表的更新标记
+ if (window.networkListUpdateMap) {
+ window.networkListUpdateMap.delete(listId);
+ }
+
// 推送同步并重绘 UI
await pushDataChange();
renderMyLists(currentListData);
@@ -9920,9 +10491,8 @@ async function handleTogglePlaylist(listId, btnElement) {
}
// Cleanup selection
- if (typeof deselectAll === 'function') deselectAll();
- if (typeof toggleBatchMode === 'function') toggleBatchMode();
- if (typeof toggleLbBatchMode === 'function') toggleLbBatchMode();
+ if (typeof exitBatchMode === 'function') exitBatchMode();
+ else if (typeof deselectAll === 'function') deselectAll();
} catch (e) {
console.error('[BatchCollect] Sync failed, reverting or refreshing:', e);
@@ -12308,5 +12878,3 @@ document.addEventListener('click', (e) => {
document.addEventListener('DOMContentLoaded', () => {
window.CustomSelectManager.initAll();
});
-
-
diff --git a/public/music/index.html b/public/music/index.html
index c926125..9ea0002 100644
--- a/public/music/index.html
+++ b/public/music/index.html
@@ -1101,7 +1101,23 @@ 本地
+ onclick="window.LocalMusicManager.toggleFilterTag('quality','flac24bit')">24bit
+
+
+
+
@@ -1299,6 +1315,18 @@ 本地
正在加载本地音乐...
+
+
+ 第 1 / 1 页
+
+
@@ -1402,10 +1430,14 @@
@@ -1562,13 +1594,13 @@ 网络设置
-
-