`;
+ } else if (c.mime.startsWith('audio')) {
+ if (c.has_coverart) {
+ mediaHtml = `
@@ -1869,6 +1887,7 @@
}
}
};
+ window.switchSidebarTab = switchSidebarTab;
const initSidebarTabs = () => {
const tabsContainer = document.querySelector('.sidebar-tabs');
diff --git a/public/s/js/v0ck.js b/public/s/js/v0ck.js
index 63f7b23..29d199b 100644
--- a/public/s/js/v0ck.js
+++ b/public/s/js/v0ck.js
@@ -88,6 +88,8 @@ const updateHoverStates = () => {
const isOver = mouseX >= rect.left && mouseX <= rect.right &&
mouseY >= rect.top && mouseY <= rect.bottom;
p.classList.toggle("v0ck_hover", isOver);
+ const gal = p.closest('.album-gallery-container');
+ if (gal) gal.classList.toggle("v0ck_hover", isOver);
});
};
@@ -117,6 +119,8 @@ class v0ck {
if (mouseX >= rect.left && mouseX <= rect.right &&
mouseY >= rect.top && mouseY <= rect.bottom) {
parent.classList.add("v0ck_hover", "v0ck_no_transition");
+ const gal = parent.closest('.album-gallery-container');
+ if (gal) gal.classList.add("v0ck_hover");
// Remove no-transition after a frame
setTimeout(() => parent.classList.remove("v0ck_no_transition"), 50);
}
@@ -142,14 +146,24 @@ class v0ck {
if (!ph) {
ph = document.createElement('div');
ph.className = 'sidebar-media-placeholder audio';
- ph.innerHTML = '';
+ ph.innerHTML = '
';
player.prepend(ph);
}
let coverCircle = ph.querySelector('.audio-cover-circle');
if (!coverCircle) {
coverCircle = document.createElement('div');
coverCircle.className = 'audio-cover-circle';
+ coverCircle.innerHTML = '';
ph.insertBefore(coverCircle, ph.firstChild);
+ } else {
+ if (!coverCircle.querySelector('i')) {
+ const existingI = ph.querySelector(':scope > i');
+ if (existingI) {
+ coverCircle.appendChild(existingI);
+ } else {
+ coverCircle.insertAdjacentHTML('beforeend', '');
+ }
+ }
}
player.style.backgroundImage = 'none';
player.style.backgroundColor = 'transparent';
@@ -157,7 +171,7 @@ class v0ck {
coverCircle.style.backgroundImage = `url('${poster}')`;
ph.classList.add('has-cover');
} else {
- coverCircle.style.backgroundImage = 'none';
+ coverCircle.style.backgroundImage = '';
ph.classList.remove('has-cover');
}
}
@@ -203,6 +217,23 @@ class v0ck {
let wasPausedWhenStarted = false;
// Mobile tap-to-show-controls: true when this touch revealed the controls bar
let controlsJustShown = false;
+
+ const setHover = (active) => {
+ if (active) {
+ player.classList.add('v0ck_hover');
+ const gal = player.closest('.album-gallery-container');
+ if (gal) gal.classList.add('v0ck_hover');
+ } else {
+ player.classList.remove('v0ck_hover');
+ const gal = player.closest('.album-gallery-container');
+ if (gal) {
+ gal.classList.remove('v0ck_hover');
+ gal.classList.remove('strip-peek');
+ const strip = gal.querySelector('.album-thumbnails-strip');
+ if (strip) strip.classList.remove('strip-peek');
+ }
+ }
+ };
const speedIndicator = player.querySelector('.v0ck_speed_indicator');
// (mouse position is now tracked via docMouseX/docMouseY in resetControlsTimer block)
@@ -343,7 +374,7 @@ class v0ck {
if (isMobile && controlsJustShown) {
// First tap: controls were just revealed by this touch — don't toggle play
controlsJustShown = false;
- player.classList.add('v0ck_hover');
+ setHover(true);
return;
}
controlsJustShown = false;
@@ -353,7 +384,7 @@ class v0ck {
toggle.addEventListener('click', togglePlay);
overlay.addEventListener('click', e => {
e.stopPropagation();
- player.classList.add('v0ck_hover');
+ setHover(true);
togglePlay();
});
video.addEventListener('play', updatePlayIcon);
@@ -831,7 +862,7 @@ class v0ck {
}
if (isMobile && !isInsidePlayer && !isFlashYankUI) {
- player.classList.remove('v0ck_hover');
+ setHover(false);
}
});
@@ -928,7 +959,7 @@ class v0ck {
const isFullscreen = player.classList.contains('v0ck_fullscreen');
if (!video.paused || isFullscreen) {
controlsTimer = setTimeout(() => {
- player.classList.remove('v0ck_hover');
+ setHover(false);
if (settingsMenu && !settingsMenu.classList.contains('v0ck_hidden')) {
settingsMenu.classList.add('v0ck_hidden');
document.dispatchEvent(new CustomEvent('v0ck_settings_closed'));
@@ -950,7 +981,7 @@ class v0ck {
docMouseX = e.clientX;
docMouseY = e.clientY;
}
- player.classList.add('v0ck_hover');
+ setHover(true);
resetControlsTimer();
}
@@ -998,7 +1029,7 @@ class v0ck {
}
docMouseX = -1;
docMouseY = -1;
- player.classList.remove('v0ck_hover');
+ setHover(false);
clearTimeout(controlsTimer);
});
diff --git a/src/inc/lib.mjs b/src/inc/lib.mjs
index cf5b46a..a923a6a 100644
--- a/src/inc/lib.mjs
+++ b/src/inc/lib.mjs
@@ -49,7 +49,18 @@ export default new class {
return slug;
}
- formatSize(size, i = ~~(Math.log(size) / Math.log(1024))) {
+ formatSize(size) {
+ if (size === undefined || size === null || size === '') return '0 B';
+ if (typeof size === 'string') {
+ if (/^\d+(\.\d+)?\s*(B|kB|KB|MB|GB|TB)$/i.test(size.trim())) {
+ return size.trim();
+ }
+ const num = Number(size);
+ if (isNaN(num)) return '0 B';
+ size = num;
+ }
+ if (isNaN(size) || size <= 0) return '0 B';
+ const i = Math.min(4, Math.max(0, ~~(Math.log(size) / Math.log(1024))));
return (size / Math.pow(1024, i)).toFixed(2) * 1 + " " + ["B", "kB", "MB", "GB", "TB"][i];
};
calcSpeed(b, s) {
diff --git a/src/inc/routeinc/f0cklib.mjs b/src/inc/routeinc/f0cklib.mjs
index b4601c0..81b33d3 100644
--- a/src/inc/routeinc/f0cklib.mjs
+++ b/src/inc/routeinc/f0cklib.mjs
@@ -1492,6 +1492,16 @@ const f0cklib = {
}
}
+ let subSizeNum = r.size;
+ if (!subSizeNum || isNaN(subSizeNum) || Number(subSizeNum) <= 0) {
+ try {
+ const bFile = path.join(cfg.paths.b, r.dest);
+ if (fs.existsSync(bFile)) {
+ subSizeNum = fs.statSync(bFile).size;
+ }
+ } catch (_) {}
+ }
+
let subTags = tagsBySubId.get(r.id) || [];
if (subTags.length === 0 && (r.order_index === 0 || idx === 0)) {
subTags = tags;
@@ -1505,7 +1515,7 @@ const f0cklib = {
src: `${cfg.websrv.paths.images}/${r.dest}`,
filename: r.dest,
mime: r.mime,
- size: lib.formatSize(r.size),
+ size: lib.formatSize(subSizeNum),
width: r.width,
height: r.height,
checksum: r.checksum,
diff --git a/src/inc/routes/apiv2/index.mjs b/src/inc/routes/apiv2/index.mjs
index 8922f95..71d27bc 100644
--- a/src/inc/routes/apiv2/index.mjs
+++ b/src/inc/routes/apiv2/index.mjs
@@ -348,6 +348,131 @@ export default router => {
}
});
+ const audioMetaCache = new Map();
+
+ group.get(/\/audio-metadata$/, async (req, res) => {
+ try {
+ const rawSrc = req.url.qs?.src || req.url.qs?.file || '';
+ const itemId = req.url.qs?.id || '';
+ if (!rawSrc && !itemId) {
+ return res.json({ success: false, msg: 'Missing src or id' }, 400);
+ }
+
+ let filename = '';
+ if (rawSrc) {
+ filename = path.basename(rawSrc.split('?')[0]);
+ }
+
+ if (filename && (filename.includes('/') || filename.includes('\\') || filename.includes('..'))) {
+ return res.json({ success: false, msg: 'Invalid filename' }, 400);
+ }
+
+ const cacheKey = filename || `item_${itemId}`;
+ if (audioMetaCache.has(cacheKey)) {
+ return res.json(audioMetaCache.get(cacheKey));
+ }
+
+ let fullPath = filename ? path.join(cfg.paths.b, filename) : null;
+ let originalFilename = '';
+
+ if (itemId) {
+ const isNumeric = /^\d+$/.test(itemId);
+ const rows = isNumeric
+ ? await db`SELECT dest, original_filename, title FROM items WHERE id = ${itemId}`
+ : await db`SELECT dest, original_filename, title FROM items WHERE slug = ${itemId}`;
+ if (rows && rows[0]) {
+ if (!fullPath) fullPath = path.join(cfg.paths.b, rows[0].dest);
+ originalFilename = rows[0].original_filename || '';
+ } else {
+ const subRows = isNumeric
+ ? await db`SELECT dest, original_filename FROM sub_items WHERE id = ${itemId}`
+ : await db`SELECT dest, original_filename FROM sub_items WHERE slug = ${itemId}`;
+ if (subRows && subRows[0]) {
+ if (!fullPath) fullPath = path.join(cfg.paths.b, subRows[0].dest);
+ originalFilename = subRows[0].original_filename || '';
+ }
+ }
+ }
+
+ if (!fullPath) {
+ return res.json({ success: false, msg: 'File not found' }, 404);
+ }
+
+ try {
+ await fs.access(fullPath);
+ } catch {
+ return res.json({ success: false, msg: 'File not found on disk' }, 404);
+ }
+
+ const metadata = await queue.getVideoMetadata(fullPath);
+ const tags = metadata || {};
+
+ // Normalize all tag keys to lowercase without punctuation (e.g. 'Title' -> 'title', 'ALBUM_ARTIST' -> 'albumartist')
+ const lowerTags = {};
+ for (const [k, v] of Object.entries(tags)) {
+ if (v != null && v !== '') {
+ const normKey = k.toLowerCase().replace(/[-_\s]/g, '');
+ lowerTags[normKey] = typeof v === 'string' ? v.trim() : String(v).trim();
+ }
+ }
+
+ let title = lowerTags.title ||
+ lowerTags.tracktitle ||
+ lowerTags.song ||
+ lowerTags.songname ||
+ lowerTags.name ||
+ '';
+
+ let artist = lowerTags.artist ||
+ lowerTags.albumartist ||
+ lowerTags.author ||
+ lowerTags.performer ||
+ lowerTags.creator ||
+ lowerTags.composer ||
+ lowerTags.byline ||
+ '';
+
+ let album = lowerTags.album ||
+ lowerTags.albumtitle ||
+ '';
+
+ let genre = lowerTags.genre || '';
+ let date = lowerTags.date || lowerTags.year || '';
+
+ if (!title && !artist) {
+ const nameToParse = originalFilename || path.parse(fullPath).name;
+ const match = nameToParse.match(/^(.+?)\s*[-–—_]\s*(.+)$/);
+ if (match) {
+ artist = match[1].replace(/^[0-9]+[\s._-]+/, '').trim();
+ title = match[2].trim();
+ } else if (nameToParse && !nameToParse.startsWith('subf0ck') && nameToParse.length < 60) {
+ title = nameToParse.trim();
+ }
+ }
+
+ const result = {
+ success: true,
+ artist: String(artist || '').trim(),
+ title: String(title || '').trim(),
+ album: String(album || '').trim(),
+ genre: String(genre || '').trim(),
+ date: String(date || '').trim(),
+ has_meta: !!(artist || title)
+ };
+
+ if (audioMetaCache.size > 1000) {
+ const firstKey = audioMetaCache.keys().next().value;
+ audioMetaCache.delete(firstKey);
+ }
+ audioMetaCache.set(cacheKey, result);
+
+ return res.json(result);
+ } catch (err) {
+ console.error('[API-V2-AUDIO-METADATA] Error:', err);
+ return res.json({ success: false, msg: 'Failed to extract audio metadata' }, 500);
+ }
+ });
+
// F-002 Security: Require authentication to prevent SSRF via arbitrary URL fetching.
// Guests may read from the cache (in-memory or DB); only authenticated users trigger real outbound fetches.
group.get(/\/meta\/fetch$/, async (req, res) => {
diff --git a/src/inc/routes/comments.mjs b/src/inc/routes/comments.mjs
index aa31e7e..d10974a 100644
--- a/src/inc/routes/comments.mjs
+++ b/src/inc/routes/comments.mjs
@@ -624,6 +624,9 @@ export default (router, tpl) => {
const itemQuery = await db`
SELECT
i.slug,
+ i.mime,
+ i.dest,
+ i.has_coverart,
i.xd_score,
COALESCE(i.visibility, 0) as visibility,
(SELECT ta.tag_id FROM tags_assign ta
@@ -684,6 +687,10 @@ export default (router, tpl) => {
db.notify('activity', JSON.stringify({
user_id: req.session.id,
item_id: item_id,
+ item_slug: (getEnableItemSlugs() && itemQuery[0]?.slug) ? itemQuery[0].slug : null,
+ mime: itemQuery[0]?.mime || null,
+ dest: itemQuery[0]?.dest || null,
+ has_coverart: !!itemQuery[0]?.has_coverart,
type: 'comment',
body: notifyBody,
id: commentId,
@@ -1104,6 +1111,7 @@ export default (router, tpl) => {
i.id as item_id,
i.slug as item_slug,
i.dest as item_dest,
+ i.has_coverart,
(SELECT ta.tag_id FROM tags_assign ta
WHERE ta.item_id = i.id AND ta.tag_id = ANY(${[1, 2, cfg.nsfl_tag_id || 3]}::int[])
ORDER BY ta.tag_id LIMIT 1) AS rating_tag_id,
diff --git a/views/snippets/footer.html b/views/snippets/footer.html
index 10d6272..952403a 100644
--- a/views/snippets/footer.html
+++ b/views/snippets/footer.html
@@ -131,6 +131,9 @@
+