Changeset 0d7acdf in Klonkt for src/routes/admin-audio.js

Timestamp:

06/20/2026 05:04:13 AM (3 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

3ec691c

Parents:

fef781e

Message:

feat(audio): per-track owner/credit + license (+ written to mp3 ID3 tags)

New per-track metadata: credit (copyright holder) + license. Editable in the
track editor (license with datalist presets: All rights reserved, CC BY/…/CC0).

• DB: audio_tracks.credit + .license.
• ID3: on upload and on every metadata edit the tags are written into the mp3 itself — copyright=credit, comment=license (new retagMp3() in the transcoder, -c copy, no re-encode) → ownership travels with a download.
• Visible: "credit · license" line below each track (post-audio-track).

busters audio.css?v=7.

Co-Authored-By: Claude <noreply@…>

File:

• src/routes/admin-audio.js (modified) (9 diffs)

src/routes/admin-audio.js

@@ -20 +20 @@
 import { toWebp } from '../services/ImageWebpService.js';
 import { requireGod } from '../middleware/auth.js';
-import { transcodeToMp3 } from '../services/AudioTranscoder.js';
+import { transcodeToMp3, retagMp3 } from '../services/AudioTranscoder.js';
 import { audioUrl } from '../services/AudioStreamService.js';
 
@@ -168 +168 @@
     const finalArtist = artist?.trim() || null;
     const finalAlbum  = album?.trim() || null;
+    // Eigenaarschap/licentie. credit valt terug op de artiest; deze gaan zowel de
+    // DB in als de ID3-tags van de mp3 (copyright + comment).
+    const finalCredit  = (req.body.credit  || '').trim() || finalArtist || null;
+    const finalLicense = (req.body.license || '').trim() || null;
 
     console.log('[admin-audio] upload received:', {
@@ -186 +190 @@
           artist: finalArtist || undefined,
           album: finalAlbum || undefined,
+          copyright: finalCredit || undefined,
+          comment: finalLicense || undefined,
         },
       });
@@ -216 +222 @@
       console.log('[admin-audio] inserting audio_tracks row (duration=' + finalDuration + ')');
       db.prepare(`
-        INSERT INTO audio_tracks (id, site_id, title, artist, album, duration, cover_url, media_id, position)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, COALESCE(
+        INSERT INTO audio_tracks (id, site_id, title, artist, album, duration, cover_url, credit, license, media_id, position)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, COALESCE(
           (SELECT MAX(position) + 1 FROM audio_tracks WHERE site_id = ?),
           0
@@ -226 +232 @@
         finalDuration,
         coverUrl,
+        finalCredit, finalLicense,
         mediaId, site.id
       );
@@ -371 +378 @@
   const t = db.prepare(`
     SELECT t.id, t.title, t.artist, t.album, t.duration, t.cover_url,
-           t.position, t.created_at, m.filename
+           t.credit, t.license, t.position, t.created_at, m.filename
     FROM audio_tracks t LEFT JOIN media m ON m.id = t.media_id
     WHERE t.id = ? AND t.site_id = ?
@@ -388 +395 @@
  * fallback keeps working.
  */
-router.post('/api/:id', requireGod, express.json(), (req, res) => {
+router.post('/api/:id', requireGod, express.json(), async (req, res) => {
   const site = res.locals.site;
   if (!site) return res.status(404).json({ error: 'Site required' });
@@ -433 +440 @@
     fields.push('downloadable = ?'); values.push(body.downloadable ? 1 : 0);
   }
+  if (Object.prototype.hasOwnProperty.call(body, 'credit')) {
+    fields.push('credit = ?'); values.push(String(body.credit || '').trim() || null);
+  }
+  if (Object.prototype.hasOwnProperty.call(body, 'license')) {
+    fields.push('license = ?'); values.push(String(body.license || '').trim() || null);
+  }
 
   if (fields.length === 0) {
@@ -445 +458 @@
   }
 
-  // Return fresh row so the caller can update its UI without reloading
+  // Verse rij + (als tag-velden wijzigden) de mp3 her-taggen, zodat de eigenaar/
+  // licentie ook IN het bestand staat (ID3) en meereist bij een download.
   const fresh = db.prepare(`
-    SELECT id, title, artist, album, duration, cover_url
-    FROM audio_tracks WHERE id = ? AND site_id = ?
+    SELECT t.id, t.title, t.artist, t.album, t.duration, t.cover_url, t.credit, t.license, m.storage_path
+    FROM audio_tracks t LEFT JOIN media m ON m.id = t.media_id
+    WHERE t.id = ? AND t.site_id = ?
   `).get(req.params.id, site.id);
-  res.json({ ok: true, track: fresh });
+
+  const tagsChanged = ['title', 'artist', 'album', 'credit', 'license']
+    .some((f) => Object.prototype.hasOwnProperty.call(body, f));
+  if (fresh && fresh.storage_path && tagsChanged) {
+    try {
+      await retagMp3({ filePath: fresh.storage_path, tags: {
+        title: fresh.title || undefined,
+        artist: fresh.artist || undefined,
+        album: fresh.album || undefined,
+        copyright: fresh.credit || undefined,
+        comment: fresh.license || undefined,
+      } });
+    } catch (e) {
+      console.warn('[admin-audio] ID3 her-taggen mislukt (DB is wel bijgewerkt):', e.message);
+    }
+  }
+  const { storage_path, ...trackOut } = fresh || {};
+  res.json({ ok: true, track: trackOut });
 });