BlueGit

timfa filemanager

Persist per-user video track selections by name

timfa Tim Falken · pushed by timfa

Authored 2026-05-08 · 6 months ago

Hash
e991d3994f08014a53c42aa180bacc334e3a2147
Parent
be44098b
3 files changed +437 −50
.github/technical-reference.md +4 −2
@@ -124,8 +124,7 @@
124 124 - disconnectThumbnailObserver() - Clears active IntersectionObserver when the grid is rebuilt.
125 125 - setThumbnailPending(iconEl, pending) - Toggles per-icon pending spinner state while a cached image thumbnail is not ready yet.
126 126 - buildThumbnailSource(item, blob, kind) - Produces thumbnail image source (data/blob URL) for icon injection.
127 - renderStreamedVideoPreview(item, targetEl) - Creates the Video.js player with HLS source/track config, enforces non-live playback UI for file streams, restores per-user video prefs (volume + subtitle style), reports watch progress, and warns when subtitle streams exist but none are web-compatible.
128 - renderStreamedVideoPreview(item, targetEl) - Creates the Video.js player with HLS source/track config, enforces non-live playback UI for file streams, uses container-fill sizing to keep previews within bounds, restores per-user video prefs (volume + subtitle style), reports watch progress, and warns when subtitle streams exist but none are web-compatible.
127 - renderStreamedVideoPreview(item, targetEl) - Creates the Video.js player with HLS source/track config, enforces non-live playback UI for file streams, uses container-fill sizing to keep previews within bounds, restores per-user video prefs (volume + caption style + subtitle/audio track names when present), reports watch progress, and warns when subtitle streams exist but none are web-compatible.
129 128 - closePreview(opts) - Closes expanded previews; video previews ignore backdrop close and require explicit close action.
130 129
131 130 ## tests/thumbnail-cache.test.js
@@ -202,6 +201,9 @@
202 201 - expanded video preview uses a stream session and video.js - Verifies streamed video preview uses the server-backed HLS session and registers subtitle tracks with video.js.
203 202 - video preview does not close on backdrop click and closes via X button - Verifies video previews require explicit close via X.
204 203 - video preview restores per-user saved volume preference - Verifies per-user saved video volume is applied on preview open.
204 - video preview restores saved subtitle/audio track names when available - Verifies per-user subtitle/audio selections are reapplied by matching track names.
205 - video preview keeps default tracks when saved names are not present - Verifies subtitle/audio defaults remain unchanged when saved names are missing.
206 - video preview saves subtitle/audio track names per user when selection changes - Verifies subtitle/audio selections are persisted into per-user video preferences.
205 207 - video preview saves caption style settings per user on close - Verifies Video.js text-track settings persist per user after closing previews.
206 208
207 209 ## tests/video-stream.test.js
@@ -124,8 +124,7 @@
124- disconnectThumbnailObserver() - Clears active IntersectionObserver when the grid is rebuilt.
124- disconnectThumbnailObserver() - Clears active IntersectionObserver when the grid is rebuilt.
125- setThumbnailPending(iconEl, pending) - Toggles per-icon pending spinner state while a cached image thumbnail is not ready yet.
125- setThumbnailPending(iconEl, pending) - Toggles per-icon pending spinner state while a cached image thumbnail is not ready yet.
126- buildThumbnailSource(item, blob, kind) - Produces thumbnail image source (data/blob URL) for icon injection.
126- buildThumbnailSource(item, blob, kind) - Produces thumbnail image source (data/blob URL) for icon injection.
127- renderStreamedVideoPreview(item, targetEl) - Creates the Video.js player with HLS source/track config, enforces non-live playback UI for file streams, restores per-user video prefs (volume + subtitle style), reports watch progress, and warns when subtitle streams exist but none are web-compatible.
127- renderStreamedVideoPreview(item, targetEl) - Creates the Video.js player with HLS source/track config, enforces non-live playback UI for file streams, uses container-fill sizing to keep previews within bounds, restores per-user video prefs (volume + caption style + subtitle/audio track names when present), reports watch progress, and warns when subtitle streams exist but none are web-compatible.
128- renderStreamedVideoPreview(item, targetEl) - Creates the Video.js player with HLS source/track config, enforces non-live playback UI for file streams, uses container-fill sizing to keep previews within bounds, restores per-user video prefs (volume + subtitle style), reports watch progress, and warns when subtitle streams exist but none are web-compatible.
129- closePreview(opts) - Closes expanded previews; video previews ignore backdrop close and require explicit close action.
128- closePreview(opts) - Closes expanded previews; video previews ignore backdrop close and require explicit close action.
130
129
131## tests/thumbnail-cache.test.js
130## tests/thumbnail-cache.test.js
@@ -202,6 +201,9 @@
202- expanded video preview uses a stream session and video.js - Verifies streamed video preview uses the server-backed HLS session and registers subtitle tracks with video.js.
201- expanded video preview uses a stream session and video.js - Verifies streamed video preview uses the server-backed HLS session and registers subtitle tracks with video.js.
203- video preview does not close on backdrop click and closes via X button - Verifies video previews require explicit close via X.
202- video preview does not close on backdrop click and closes via X button - Verifies video previews require explicit close via X.
204- video preview restores per-user saved volume preference - Verifies per-user saved video volume is applied on preview open.
203- video preview restores per-user saved volume preference - Verifies per-user saved video volume is applied on preview open.
204- video preview restores saved subtitle/audio track names when available - Verifies per-user subtitle/audio selections are reapplied by matching track names.
205- video preview keeps default tracks when saved names are not present - Verifies subtitle/audio defaults remain unchanged when saved names are missing.
206- video preview saves subtitle/audio track names per user when selection changes - Verifies subtitle/audio selections are persisted into per-user video preferences.
205- video preview saves caption style settings per user on close - Verifies Video.js text-track settings persist per user after closing previews.
207- video preview saves caption style settings per user on close - Verifies Video.js text-track settings persist per user after closing previews.
206
208
207## tests/video-stream.test.js
209## tests/video-stream.test.js
public/app.js +163 −1
@@ -265,6 +265,160 @@ function captureUserVideoTextTrackPrefs ()
265 265 }
266 266 }
267 267
268 function normaliseTrackName (name)
269 {
270 return String(name || '').trim().toLowerCase();
271 }
272
273 function getTrackName (track)
274 {
275 if (!track || typeof track !== 'object') return '';
276 const label = String(track.label || '').trim();
277 if (label) return label;
278 const name = String(track.name || '').trim();
279 if (name) return name;
280 const language = String(track.language || '').trim();
281 if (language) return language;
282 const id = String(track.id || '').trim();
283 if (id) return id;
284 return '';
285 }
286
287 function trackListToArray (trackList)
288 {
289 if (!trackList || typeof trackList.length !== 'number') return [];
290 const out = [];
291 for (let i = 0; i < trackList.length; i++)
292 {
293 const track = trackList[i] || (typeof trackList.item === 'function' ? trackList.item(i) : null);
294 if (track) out.push(track);
295 }
296 return out;
297 }
298
299 function subtitleTracksFromPlayer (player)
300 {
301 if (!player || typeof player.textTracks !== 'function') return [];
302 return trackListToArray(player.textTracks()).filter((track) =>
303 {
304 const kind = String(track.kind || '').toLowerCase();
305 return kind === 'subtitles' || kind === 'captions';
306 });
307 }
308
309 function audioTracksFromPlayer (player)
310 {
311 if (!player || typeof player.audioTracks !== 'function') return [];
312 return trackListToArray(player.audioTracks());
313 }
314
315 function applySavedSubtitleTrack (player, savedName)
316 {
317 if (typeof savedName !== 'string') return;
318 const tracks = subtitleTracksFromPlayer(player);
319 if (!tracks.length) return;
320
321 const wanted = normaliseTrackName(savedName);
322 if (!wanted)
323 {
324 for (const track of tracks) track.mode = 'disabled';
325 return;
326 }
327
328 const match = tracks.find((track) => normaliseTrackName(getTrackName(track)) === wanted);
329 if (!match) return;
330
331 for (const track of tracks)
332 {
333 track.mode = track === match ? 'showing' : 'disabled';
334 }
335 }
336
337 function applySavedAudioTrack (player, savedName)
338 {
339 if (typeof savedName !== 'string') return;
340 const tracks = audioTracksFromPlayer(player);
341 if (!tracks.length) return;
342
343 const wanted = normaliseTrackName(savedName);
344 if (!wanted) return;
345
346 const match = tracks.find((track) => normaliseTrackName(getTrackName(track)) === wanted);
347 if (!match) return;
348
349 for (const track of tracks)
350 {
351 track.enabled = track === match;
352 }
353 }
354
355 function getSelectedSubtitleTrackName (player)
356 {
357 const tracks = subtitleTracksFromPlayer(player);
358 if (!tracks.length) return null;
359 const active = tracks.find((track) => String(track.mode || '').toLowerCase() === 'showing');
360 return active ? getTrackName(active) : '';
361 }
362
363 function getSelectedAudioTrackName (player)
364 {
365 const tracks = audioTracksFromPlayer(player);
366 if (!tracks.length) return null;
367 const active = tracks.find((track) => !!track.enabled);
368 return active ? getTrackName(active) : '';
369 }
370
371 function bindUserVideoTrackPrefs (player, prefs)
372 {
373 const applySavedTracks = () =>
374 {
375 applySavedSubtitleTrack(player, prefs.subtitleTrackName);
376 applySavedAudioTrack(player, prefs.audioTrackName);
377 };
378
379 const captureSelectedTracks = () =>
380 {
381 const subtitleTrackName = getSelectedSubtitleTrackName(player);
382 const audioTrackName = getSelectedAudioTrackName(player);
383 const patch = {};
384
385 if (subtitleTrackName !== null) patch.subtitleTrackName = subtitleTrackName;
386 if (audioTrackName !== null) patch.audioTrackName = audioTrackName;
387
388 if (Object.keys(patch).length) saveUserVideoPrefs(patch);
389 };
390
391 const textTrackList = typeof player.textTracks === 'function' ? player.textTracks() : null;
392 const audioTrackList = typeof player.audioTracks === 'function' ? player.audioTracks() : null;
393 const onTrackListChange = () => captureSelectedTracks();
394
395 if (textTrackList && typeof textTrackList.addEventListener === 'function')
396 {
397 textTrackList.addEventListener('change', onTrackListChange);
398 }
399
400 if (audioTrackList && typeof audioTrackList.addEventListener === 'function')
401 {
402 audioTrackList.addEventListener('change', onTrackListChange);
403 }
404
405 return {
406 applySavedTracks,
407 captureSelectedTracks,
408 detach: () =>
409 {
410 if (textTrackList && typeof textTrackList.removeEventListener === 'function')
411 {
412 textTrackList.removeEventListener('change', onTrackListChange);
413 }
414 if (audioTrackList && typeof audioTrackList.removeEventListener === 'function')
415 {
416 audioTrackList.removeEventListener('change', onTrackListChange);
417 }
418 },
419 };
420 }
421
268 422 function normaliseVideoDuration (player, durationSeconds)
269 423 {
270 424 const duration = Number(durationSeconds);
@@ -2452,6 +2606,8 @@ async function renderStreamedVideoPreview (item, targetEl)
2452 2606 })),
2453 2607 });
2454 2608
2609 const trackPrefs = bindUserVideoTrackPrefs(player, prefs);
2610
2455 2611 ensureVideoPlaybackUi(player, session.durationSeconds);
2456 2612
2457 2613 let sentPartway = false;
@@ -2496,8 +2652,12 @@ async function renderStreamedVideoPreview (item, targetEl)
2496 2652 {
2497 2653 player.volume(Math.max(0, Math.min(1, volume)));
2498 2654 }
2655 trackPrefs.applySavedTracks();
2499 2656 });
2500 2657
2658 player.on('loadedmetadata', trackPrefs.applySavedTracks);
2659 player.on('loadedplaylist', trackPrefs.applySavedTracks);
2660
2501 2661 player.on('timeupdate', markWatch);
2502 2662 player.on('ended', () =>
2503 2663 {
@@ -2514,8 +2674,10 @@ async function renderStreamedVideoPreview (item, targetEl)
2514 2674 STATE.previewCleanup = () =>
2515 2675 {
2516 2676 try { markWatch(); } catch { /* ignore */ }
2517 try { player.dispose(); } catch { /* ignore */ }
2677 try { trackPrefs.captureSelectedTracks(); } catch { /* ignore */ }
2518 2678 captureUserVideoTextTrackPrefs();
2679 try { trackPrefs.detach(); } catch { /* ignore */ }
2680 try { player.dispose(); } catch { /* ignore */ }
2519 2681 };
2520 2682 }
2521 2683
@@ -265,6 +265,160 @@ function captureUserVideoTextTrackPrefs ()
265 }
265 }
266}
266}
267
267
268function normaliseTrackName (name)
269{
270 return String(name || '').trim().toLowerCase();
271}
272
273function getTrackName (track)
274{
275 if (!track || typeof track !== 'object') return '';
276 const label = String(track.label || '').trim();
277 if (label) return label;
278 const name = String(track.name || '').trim();
279 if (name) return name;
280 const language = String(track.language || '').trim();
281 if (language) return language;
282 const id = String(track.id || '').trim();
283 if (id) return id;
284 return '';
285}
286
287function trackListToArray (trackList)
288{
289 if (!trackList || typeof trackList.length !== 'number') return [];
290 const out = [];
291 for (let i = 0; i < trackList.length; i++)
292 {
293 const track = trackList[i] || (typeof trackList.item === 'function' ? trackList.item(i) : null);
294 if (track) out.push(track);
295 }
296 return out;
297}
298
299function subtitleTracksFromPlayer (player)
300{
301 if (!player || typeof player.textTracks !== 'function') return [];
302 return trackListToArray(player.textTracks()).filter((track) =>
303 {
304 const kind = String(track.kind || '').toLowerCase();
305 return kind === 'subtitles' || kind === 'captions';
306 });
307}
308
309function audioTracksFromPlayer (player)
310{
311 if (!player || typeof player.audioTracks !== 'function') return [];
312 return trackListToArray(player.audioTracks());
313}
314
315function applySavedSubtitleTrack (player, savedName)
316{
317 if (typeof savedName !== 'string') return;
318 const tracks = subtitleTracksFromPlayer(player);
319 if (!tracks.length) return;
320
321 const wanted = normaliseTrackName(savedName);
322 if (!wanted)
323 {
324 for (const track of tracks) track.mode = 'disabled';
325 return;
326 }
327
328 const match = tracks.find((track) => normaliseTrackName(getTrackName(track)) === wanted);
329 if (!match) return;
330
331 for (const track of tracks)
332 {
333 track.mode = track === match ? 'showing' : 'disabled';
334 }
335}
336
337function applySavedAudioTrack (player, savedName)
338{
339 if (typeof savedName !== 'string') return;
340 const tracks = audioTracksFromPlayer(player);
341 if (!tracks.length) return;
342
343 const wanted = normaliseTrackName(savedName);
344 if (!wanted) return;
345
346 const match = tracks.find((track) => normaliseTrackName(getTrackName(track)) === wanted);
347 if (!match) return;
348
349 for (const track of tracks)
350 {
351 track.enabled = track === match;
352 }
353}
354
355function getSelectedSubtitleTrackName (player)
356{
357 const tracks = subtitleTracksFromPlayer(player);
358 if (!tracks.length) return null;
359 const active = tracks.find((track) => String(track.mode || '').toLowerCase() === 'showing');
360 return active ? getTrackName(active) : '';
361}
362
363function getSelectedAudioTrackName (player)
364{
365 const tracks = audioTracksFromPlayer(player);
366 if (!tracks.length) return null;
367 const active = tracks.find((track) => !!track.enabled);
368 return active ? getTrackName(active) : '';
369}
370
371function bindUserVideoTrackPrefs (player, prefs)
372{
373 const applySavedTracks = () =>
374 {
375 applySavedSubtitleTrack(player, prefs.subtitleTrackName);
376 applySavedAudioTrack(player, prefs.audioTrackName);
377 };
378
379 const captureSelectedTracks = () =>
380 {
381 const subtitleTrackName = getSelectedSubtitleTrackName(player);
382 const audioTrackName = getSelectedAudioTrackName(player);
383 const patch = {};
384
385 if (subtitleTrackName !== null) patch.subtitleTrackName = subtitleTrackName;
386 if (audioTrackName !== null) patch.audioTrackName = audioTrackName;
387
388 if (Object.keys(patch).length) saveUserVideoPrefs(patch);
389 };
390
391 const textTrackList = typeof player.textTracks === 'function' ? player.textTracks() : null;
392 const audioTrackList = typeof player.audioTracks === 'function' ? player.audioTracks() : null;
393 const onTrackListChange = () => captureSelectedTracks();
394
395 if (textTrackList && typeof textTrackList.addEventListener === 'function')
396 {
397 textTrackList.addEventListener('change', onTrackListChange);
398 }
399
400 if (audioTrackList && typeof audioTrackList.addEventListener === 'function')
401 {
402 audioTrackList.addEventListener('change', onTrackListChange);
403 }
404
405 return {
406 applySavedTracks,
407 captureSelectedTracks,
408 detach: () =>
409 {
410 if (textTrackList && typeof textTrackList.removeEventListener === 'function')
411 {
412 textTrackList.removeEventListener('change', onTrackListChange);
413 }
414 if (audioTrackList && typeof audioTrackList.removeEventListener === 'function')
415 {
416 audioTrackList.removeEventListener('change', onTrackListChange);
417 }
418 },
419 };
420}
421
268function normaliseVideoDuration (player, durationSeconds)
422function normaliseVideoDuration (player, durationSeconds)
269{
423{
270 const duration = Number(durationSeconds);
424 const duration = Number(durationSeconds);
@@ -2452,6 +2606,8 @@ async function renderStreamedVideoPreview (item, targetEl)
2452 })),
2606 })),
2453 });
2607 });
2454
2608
2609 const trackPrefs = bindUserVideoTrackPrefs(player, prefs);
2610
2455 ensureVideoPlaybackUi(player, session.durationSeconds);
2611 ensureVideoPlaybackUi(player, session.durationSeconds);
2456
2612
2457 let sentPartway = false;
2613 let sentPartway = false;
@@ -2496,8 +2652,12 @@ async function renderStreamedVideoPreview (item, targetEl)
2496 {
2652 {
2497 player.volume(Math.max(0, Math.min(1, volume)));
2653 player.volume(Math.max(0, Math.min(1, volume)));
2498 }
2654 }
2655 trackPrefs.applySavedTracks();
2499 });
2656 });
2500
2657
2658 player.on('loadedmetadata', trackPrefs.applySavedTracks);
2659 player.on('loadedplaylist', trackPrefs.applySavedTracks);
2660
2501 player.on('timeupdate', markWatch);
2661 player.on('timeupdate', markWatch);
2502 player.on('ended', () =>
2662 player.on('ended', () =>
2503 {
2663 {
@@ -2514,8 +2674,10 @@ async function renderStreamedVideoPreview (item, targetEl)
2514 STATE.previewCleanup = () =>
2674 STATE.previewCleanup = () =>
2515 {
2675 {
2516 try { markWatch(); } catch { /* ignore */ }
2676 try { markWatch(); } catch { /* ignore */ }
2517 try { player.dispose(); } catch { /* ignore */ }
2677 try { trackPrefs.captureSelectedTracks(); } catch { /* ignore */ }
2518 captureUserVideoTextTrackPrefs();
2678 captureUserVideoTextTrackPrefs();
2679 try { trackPrefs.detach(); } catch { /* ignore */ }
2680 try { player.dispose(); } catch { /* ignore */ }
2519 };
2681 };
2520}
2682}
2521
2683
tests/page.load.test.js +270 −47
@@ -198,40 +198,117 @@ describe('page load smoke test', () =>
198 198 let blobCounter = 0;
199 199 window.URL.createObjectURL = () => `blob:mock-${blobCounter++}`;
200 200 window.URL.revokeObjectURL = () => { };
201 window.__lastVideoJsOptions = null;
202 window.__lastVideoJsVolumeSet = null;
203 window.__lastVideoJsPlayer = null;
204 window.videojs = (element, options) =>
205 {
206 window.__lastVideoJsOptions = options;
207 let volumeValue = 1;
208 let durationValue = 20;
209 const player = {
210 ready (cb)
211 {
212 if (typeof cb === 'function') cb();
213 },
214 on () { },
215 trigger () { },
216 duration (next)
217 {
218 if (next === undefined) return durationValue;
219 durationValue = Number(next);
220 return durationValue;
221 },
222 currentTime () { return 0; },
223 volume (next)
224 {
201 window.__lastVideoJsOptions = null;
202 window.__lastVideoJsVolumeSet = null;
203 window.__lastVideoJsPlayer = null;
204 window.__lastVideoJsTextTracks = null;
205 window.__lastVideoJsAudioTracks = null;
206 window.__mockVideoJsAudioTracks = [];
207 window.videojs = (element, options) =>
208 {
209 window.__lastVideoJsOptions = options;
210 let volumeValue = 1;
211 let durationValue = 20;
212
213 const listenersByType = new Map();
214 function makeEventTarget ()
215 {
216 const listeners = new Map();
217 return {
218 addEventListener (type, fn)
219 {
220 if (!listeners.has(type)) listeners.set(type, new Set());
221 listeners.get(type).add(fn);
222 },
223 removeEventListener (type, fn)
224 {
225 const handlers = listeners.get(type);
226 if (!handlers) return;
227 handlers.delete(fn);
228 },
229 dispatchEvent (type)
230 {
231 const handlers = listeners.get(type);
232 if (!handlers) return;
233 for (const fn of Array.from(handlers)) fn();
234 },
235 };
236 }
237
238 function makeTrackList (tracks)
239 {
240 const eventTarget = makeEventTarget();
241 const list = {
242 length: tracks.length,
243 item (index)
244 {
245 return tracks[index] || null;
246 },
247 addEventListener: eventTarget.addEventListener,
248 removeEventListener: eventTarget.removeEventListener,
249 dispatchEvent: eventTarget.dispatchEvent,
250 };
251
252 for (let i = 0; i < tracks.length; i++)
253 {
254 list[i] = tracks[i];
255 }
256
257 return list;
258 }
259
260 const textTracks = makeTrackList((options?.tracks || []).map((track) => ({
261 kind: track.kind,
262 label: track.label,
263 language: track.srclang,
264 mode: track.default ? 'showing' : 'disabled',
265 })));
266 const audioTracks = makeTrackList((window.__mockVideoJsAudioTracks || []).map((track) => ({
267 label: track.label,
268 language: track.language,
269 enabled: !!track.enabled,
270 })));
271
272 window.__lastVideoJsTextTracks = textTracks;
273 window.__lastVideoJsAudioTracks = audioTracks;
274
275 const player = {
276 ready (cb)
277 {
278 if (typeof cb === 'function') cb();
279 },
280 on (type, fn)
281 {
282 if (!listenersByType.has(type)) listenersByType.set(type, new Set());
283 listenersByType.get(type).add(fn);
284 },
285 trigger (type)
286 {
287 const listeners = listenersByType.get(type);
288 if (!listeners) return;
289 for (const fn of Array.from(listeners)) fn();
290 },
291 duration (next)
292 {
293 if (next === undefined) return durationValue;
294 durationValue = Number(next);
295 return durationValue;
296 },
297 currentTime () { return 0; },
298 textTracks () { return textTracks; },
299 audioTracks () { return audioTracks; },
300 volume (next)
301 {
225 302 if (next === undefined) return volumeValue;
226 303 volumeValue = Number(next);
227 304 window.__lastVideoJsVolumeSet = volumeValue;
228 305 return volumeValue;
229 },
230 dispose () { },
231 };
232 window.__lastVideoJsPlayer = player;
233 return player;
234 };
306 },
307 dispose () { },
308 };
309 window.__lastVideoJsPlayer = player;
310 return player;
311 };
235 312
236 313 const defaultSaved = {
237 314 token: 'saved-token',
@@ -663,12 +740,12 @@ describe('page load smoke test', () =>
663 740 mtime: Date.now(),
664 741 },
665 742 ];
666 videoStreamFixture['/data/clip.mkv'] = {
667 sessionId: 'video-session',
668 playlistUrl: '/api/files/video-stream/video-session/master.m3u8',
669 durationSeconds: 120,
670 subtitleTracks: [{ label: 'English', language: 'eng', default: true, src: '/api/files/video-stream/video-session/subtitle-0.vtt' }],
671 };
743 videoStreamFixture['/data/clip.mkv'] = {
744 sessionId: 'video-session',
745 playlistUrl: '/api/files/video-stream/video-session/master.m3u8',
746 durationSeconds: 120,
747 subtitleTracks: [{ label: 'English', language: 'eng', default: true, src: '/api/files/video-stream/video-session/subtitle-0.vtt' }],
748 };
672 749
673 750 const { dom, runtimeErrors } = await bootClient();
674 751 expect(runtimeErrors).toEqual([]);
@@ -682,17 +759,17 @@ describe('page load smoke test', () =>
682 759 await waitFor(dom, () => !!dom.window.document.querySelector('.preview-video-js'));
683 760
684 761 expect(dom.window.__lastVideoJsOptions).toBeTruthy();
685 expect(dom.window.__lastVideoJsOptions.sources[0].src).toBe('/api/files/video-stream/video-session/master.m3u8');
686 expect(dom.window.__lastVideoJsOptions.fluid).toBe(false);
687 expect(dom.window.__lastVideoJsOptions.fill).toBe(true);
688 expect(dom.window.__lastVideoJsOptions.controlBar).toMatchObject({
689 currentTimeDisplay: true,
690 timeDivider: true,
691 durationDisplay: true,
692 remainingTimeDisplay: false,
693 });
694 expect(dom.window.__lastVideoJsPlayer.duration()).toBe(120);
695 expect(dom.window.__lastVideoJsOptions.tracks).toEqual([
762 expect(dom.window.__lastVideoJsOptions.sources[0].src).toBe('/api/files/video-stream/video-session/master.m3u8');
763 expect(dom.window.__lastVideoJsOptions.fluid).toBe(false);
764 expect(dom.window.__lastVideoJsOptions.fill).toBe(true);
765 expect(dom.window.__lastVideoJsOptions.controlBar).toMatchObject({
766 currentTimeDisplay: true,
767 timeDivider: true,
768 durationDisplay: true,
769 remainingTimeDisplay: false,
770 });
771 expect(dom.window.__lastVideoJsPlayer.duration()).toBe(120);
772 expect(dom.window.__lastVideoJsOptions.tracks).toEqual([
696 773 {
697 774 kind: 'subtitles',
698 775 src: '/api/files/video-stream/video-session/subtitle-0.vtt',
@@ -781,6 +858,152 @@ describe('page load smoke test', () =>
781 858 dom.window.close();
782 859 });
783 860
861 test('video preview restores saved subtitle/audio track names when available', async () =>
862 {
863 listFixture['/data'] = [
864 {
865 name: 'clip.mkv',
866 path: '/data/clip.mkv',
867 isDir: false,
868 size: 64,
869 mtime: Date.now(),
870 },
871 ];
872 videoStreamFixture['/data/clip.mkv'] = {
873 sessionId: 'video-session',
874 playlistUrl: '/api/files/video-stream/video-session/master.m3u8',
875 subtitleTracks: [
876 { label: 'English', language: 'eng', default: true, src: '/api/files/video-stream/video-session/subtitle-0.vtt' },
877 { label: 'French', language: 'fra', default: false, src: '/api/files/video-stream/video-session/subtitle-1.vtt' },
878 ],
879 subtitleSummary: { total: 2, converted: 2, skipped: 0 },
880 };
881
882 const { dom, runtimeErrors } = await bootClient();
883 expect(runtimeErrors).toEqual([]);
884
885 dom.window.__mockVideoJsAudioTracks = [
886 { label: 'Stereo', enabled: false },
887 { label: 'Director commentary', enabled: true },
888 ];
889 dom.window.localStorage.setItem('filemanager.video-prefs.v1.tester', JSON.stringify({
890 subtitleTrackName: 'French',
891 audioTrackName: 'Stereo',
892 textTrackSettings: '{"color":"#ffee00"}',
893 }));
894
895 await waitFor(dom, () => !!dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]'));
896
897 const tile = dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]');
898 tile.dispatchEvent(new dom.window.MouseEvent('dblclick', { bubbles: true }));
899 await waitFor(dom, () => !!dom.window.document.querySelector('.preview-video-js'));
900
901 expect(dom.window.localStorage.getItem('vjs-text-track-settings')).toBe('{"color":"#ffee00"}');
902 expect(dom.window.__lastVideoJsTextTracks.item(0).mode).toBe('disabled');
903 expect(dom.window.__lastVideoJsTextTracks.item(1).mode).toBe('showing');
904 expect(dom.window.__lastVideoJsAudioTracks.item(0).enabled).toBe(true);
905 expect(dom.window.__lastVideoJsAudioTracks.item(1).enabled).toBe(false);
906
907 dom.window.close();
908 });
909
910 test('video preview keeps default tracks when saved names are not present', async () =>
911 {
912 listFixture['/data'] = [
913 {
914 name: 'clip.mkv',
915 path: '/data/clip.mkv',
916 isDir: false,
917 size: 64,
918 mtime: Date.now(),
919 },
920 ];
921 videoStreamFixture['/data/clip.mkv'] = {
922 sessionId: 'video-session',
923 playlistUrl: '/api/files/video-stream/video-session/master.m3u8',
924 subtitleTracks: [
925 { label: 'English', language: 'eng', default: true, src: '/api/files/video-stream/video-session/subtitle-0.vtt' },
926 { label: 'French', language: 'fra', default: false, src: '/api/files/video-stream/video-session/subtitle-1.vtt' },
927 ],
928 subtitleSummary: { total: 2, converted: 2, skipped: 0 },
929 };
930
931 const { dom, runtimeErrors } = await bootClient();
932 expect(runtimeErrors).toEqual([]);
933
934 dom.window.__mockVideoJsAudioTracks = [
935 { label: 'Stereo', enabled: false },
936 { label: 'Director commentary', enabled: true },
937 ];
938 dom.window.localStorage.setItem('filemanager.video-prefs.v1.tester', JSON.stringify({
939 subtitleTrackName: 'Spanish',
940 audioTrackName: 'Dolby Atmos',
941 }));
942
943 await waitFor(dom, () => !!dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]'));
944
945 const tile = dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]');
946 tile.dispatchEvent(new dom.window.MouseEvent('dblclick', { bubbles: true }));
947 await waitFor(dom, () => !!dom.window.document.querySelector('.preview-video-js'));
948
949 expect(dom.window.__lastVideoJsTextTracks.item(0).mode).toBe('showing');
950 expect(dom.window.__lastVideoJsTextTracks.item(1).mode).toBe('disabled');
951 expect(dom.window.__lastVideoJsAudioTracks.item(0).enabled).toBe(false);
952 expect(dom.window.__lastVideoJsAudioTracks.item(1).enabled).toBe(true);
953
954 dom.window.close();
955 });
956
957 test('video preview saves subtitle/audio track names per user when selection changes', async () =>
958 {
959 listFixture['/data'] = [
960 {
961 name: 'clip.mkv',
962 path: '/data/clip.mkv',
963 isDir: false,
964 size: 64,
965 mtime: Date.now(),
966 },
967 ];
968 videoStreamFixture['/data/clip.mkv'] = {
969 sessionId: 'video-session',
970 playlistUrl: '/api/files/video-stream/video-session/master.m3u8',
971 subtitleTracks: [
972 { label: 'English', language: 'eng', default: true, src: '/api/files/video-stream/video-session/subtitle-0.vtt' },
973 { label: 'French', language: 'fra', default: false, src: '/api/files/video-stream/video-session/subtitle-1.vtt' },
974 ],
975 subtitleSummary: { total: 2, converted: 2, skipped: 0 },
976 };
977
978 const { dom, runtimeErrors } = await bootClient();
979 expect(runtimeErrors).toEqual([]);
980
981 dom.window.__mockVideoJsAudioTracks = [
982 { label: 'Stereo', enabled: true },
983 { label: 'Director commentary', enabled: false },
984 ];
985
986 await waitFor(dom, () => !!dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]'));
987
988 const tile = dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]');
989 tile.dispatchEvent(new dom.window.MouseEvent('dblclick', { bubbles: true }));
990 await waitFor(dom, () => !!dom.window.document.querySelector('.preview-video-js'));
991
992 dom.window.__lastVideoJsTextTracks.item(0).mode = 'disabled';
993 dom.window.__lastVideoJsTextTracks.item(1).mode = 'showing';
994 dom.window.__lastVideoJsTextTracks.dispatchEvent('change');
995
996 dom.window.__lastVideoJsAudioTracks.item(0).enabled = false;
997 dom.window.__lastVideoJsAudioTracks.item(1).enabled = true;
998 dom.window.__lastVideoJsAudioTracks.dispatchEvent('change');
999
1000 const stored = JSON.parse(dom.window.localStorage.getItem('filemanager.video-prefs.v1.tester'));
1001 expect(stored.subtitleTrackName).toBe('French');
1002 expect(stored.audioTrackName).toBe('Director commentary');
1003
1004 dom.window.close();
1005 });
1006
784 1007 test('video preview saves caption style settings per user on close', async () =>
785 1008 {
786 1009 listFixture['/data'] = [
@@ -198,40 +198,117 @@ describe('page load smoke test', () =>
198 let blobCounter = 0;
198 let blobCounter = 0;
199 window.URL.createObjectURL = () => `blob:mock-${blobCounter++}`;
199 window.URL.createObjectURL = () => `blob:mock-${blobCounter++}`;
200 window.URL.revokeObjectURL = () => { };
200 window.URL.revokeObjectURL = () => { };
201 window.__lastVideoJsOptions = null;
201 window.__lastVideoJsOptions = null;
202 window.__lastVideoJsVolumeSet = null;
202 window.__lastVideoJsVolumeSet = null;
203 window.__lastVideoJsPlayer = null;
203 window.__lastVideoJsPlayer = null;
204 window.videojs = (element, options) =>
204 window.__lastVideoJsTextTracks = null;
205 {
205 window.__lastVideoJsAudioTracks = null;
206 window.__lastVideoJsOptions = options;
206 window.__mockVideoJsAudioTracks = [];
207 let volumeValue = 1;
207 window.videojs = (element, options) =>
208 let durationValue = 20;
208 {
209 const player = {
209 window.__lastVideoJsOptions = options;
210 ready (cb)
210 let volumeValue = 1;
211 {
211 let durationValue = 20;
212 if (typeof cb === 'function') cb();
212
213 },
213 const listenersByType = new Map();
214 on () { },
214 function makeEventTarget ()
215 trigger () { },
215 {
216 duration (next)
216 const listeners = new Map();
217 {
217 return {
218 if (next === undefined) return durationValue;
218 addEventListener (type, fn)
219 durationValue = Number(next);
219 {
220 return durationValue;
220 if (!listeners.has(type)) listeners.set(type, new Set());
221 },
221 listeners.get(type).add(fn);
222 currentTime () { return 0; },
222 },
223 volume (next)
223 removeEventListener (type, fn)
224 {
224 {
225 const handlers = listeners.get(type);
226 if (!handlers) return;
227 handlers.delete(fn);
228 },
229 dispatchEvent (type)
230 {
231 const handlers = listeners.get(type);
232 if (!handlers) return;
233 for (const fn of Array.from(handlers)) fn();
234 },
235 };
236 }
237
238 function makeTrackList (tracks)
239 {
240 const eventTarget = makeEventTarget();
241 const list = {
242 length: tracks.length,
243 item (index)
244 {
245 return tracks[index] || null;
246 },
247 addEventListener: eventTarget.addEventListener,
248 removeEventListener: eventTarget.removeEventListener,
249 dispatchEvent: eventTarget.dispatchEvent,
250 };
251
252 for (let i = 0; i < tracks.length; i++)
253 {
254 list[i] = tracks[i];
255 }
256
257 return list;
258 }
259
260 const textTracks = makeTrackList((options?.tracks || []).map((track) => ({
261 kind: track.kind,
262 label: track.label,
263 language: track.srclang,
264 mode: track.default ? 'showing' : 'disabled',
265 })));
266 const audioTracks = makeTrackList((window.__mockVideoJsAudioTracks || []).map((track) => ({
267 label: track.label,
268 language: track.language,
269 enabled: !!track.enabled,
270 })));
271
272 window.__lastVideoJsTextTracks = textTracks;
273 window.__lastVideoJsAudioTracks = audioTracks;
274
275 const player = {
276 ready (cb)
277 {
278 if (typeof cb === 'function') cb();
279 },
280 on (type, fn)
281 {
282 if (!listenersByType.has(type)) listenersByType.set(type, new Set());
283 listenersByType.get(type).add(fn);
284 },
285 trigger (type)
286 {
287 const listeners = listenersByType.get(type);
288 if (!listeners) return;
289 for (const fn of Array.from(listeners)) fn();
290 },
291 duration (next)
292 {
293 if (next === undefined) return durationValue;
294 durationValue = Number(next);
295 return durationValue;
296 },
297 currentTime () { return 0; },
298 textTracks () { return textTracks; },
299 audioTracks () { return audioTracks; },
300 volume (next)
301 {
225 if (next === undefined) return volumeValue;
302 if (next === undefined) return volumeValue;
226 volumeValue = Number(next);
303 volumeValue = Number(next);
227 window.__lastVideoJsVolumeSet = volumeValue;
304 window.__lastVideoJsVolumeSet = volumeValue;
228 return volumeValue;
305 return volumeValue;
229 },
306 },
230 dispose () { },
307 dispose () { },
231 };
308 };
232 window.__lastVideoJsPlayer = player;
309 window.__lastVideoJsPlayer = player;
233 return player;
310 return player;
234 };
311 };
235
312
236 const defaultSaved = {
313 const defaultSaved = {
237 token: 'saved-token',
314 token: 'saved-token',
@@ -663,12 +740,12 @@ describe('page load smoke test', () =>
663 mtime: Date.now(),
740 mtime: Date.now(),
664 },
741 },
665 ];
742 ];
666 videoStreamFixture['/data/clip.mkv'] = {
743 videoStreamFixture['/data/clip.mkv'] = {
667 sessionId: 'video-session',
744 sessionId: 'video-session',
668 playlistUrl: '/api/files/video-stream/video-session/master.m3u8',
745 playlistUrl: '/api/files/video-stream/video-session/master.m3u8',
669 durationSeconds: 120,
746 durationSeconds: 120,
670 subtitleTracks: [{ label: 'English', language: 'eng', default: true, src: '/api/files/video-stream/video-session/subtitle-0.vtt' }],
747 subtitleTracks: [{ label: 'English', language: 'eng', default: true, src: '/api/files/video-stream/video-session/subtitle-0.vtt' }],
671 };
748 };
672
749
673 const { dom, runtimeErrors } = await bootClient();
750 const { dom, runtimeErrors } = await bootClient();
674 expect(runtimeErrors).toEqual([]);
751 expect(runtimeErrors).toEqual([]);
@@ -682,17 +759,17 @@ describe('page load smoke test', () =>
682 await waitFor(dom, () => !!dom.window.document.querySelector('.preview-video-js'));
759 await waitFor(dom, () => !!dom.window.document.querySelector('.preview-video-js'));
683
760
684 expect(dom.window.__lastVideoJsOptions).toBeTruthy();
761 expect(dom.window.__lastVideoJsOptions).toBeTruthy();
685 expect(dom.window.__lastVideoJsOptions.sources[0].src).toBe('/api/files/video-stream/video-session/master.m3u8');
762 expect(dom.window.__lastVideoJsOptions.sources[0].src).toBe('/api/files/video-stream/video-session/master.m3u8');
686 expect(dom.window.__lastVideoJsOptions.fluid).toBe(false);
763 expect(dom.window.__lastVideoJsOptions.fluid).toBe(false);
687 expect(dom.window.__lastVideoJsOptions.fill).toBe(true);
764 expect(dom.window.__lastVideoJsOptions.fill).toBe(true);
688 expect(dom.window.__lastVideoJsOptions.controlBar).toMatchObject({
765 expect(dom.window.__lastVideoJsOptions.controlBar).toMatchObject({
689 currentTimeDisplay: true,
766 currentTimeDisplay: true,
690 timeDivider: true,
767 timeDivider: true,
691 durationDisplay: true,
768 durationDisplay: true,
692 remainingTimeDisplay: false,
769 remainingTimeDisplay: false,
693 });
770 });
694 expect(dom.window.__lastVideoJsPlayer.duration()).toBe(120);
771 expect(dom.window.__lastVideoJsPlayer.duration()).toBe(120);
695 expect(dom.window.__lastVideoJsOptions.tracks).toEqual([
772 expect(dom.window.__lastVideoJsOptions.tracks).toEqual([
696 {
773 {
697 kind: 'subtitles',
774 kind: 'subtitles',
698 src: '/api/files/video-stream/video-session/subtitle-0.vtt',
775 src: '/api/files/video-stream/video-session/subtitle-0.vtt',
@@ -781,6 +858,152 @@ describe('page load smoke test', () =>
781 dom.window.close();
858 dom.window.close();
782 });
859 });
783
860
861 test('video preview restores saved subtitle/audio track names when available', async () =>
862 {
863 listFixture['/data'] = [
864 {
865 name: 'clip.mkv',
866 path: '/data/clip.mkv',
867 isDir: false,
868 size: 64,
869 mtime: Date.now(),
870 },
871 ];
872 videoStreamFixture['/data/clip.mkv'] = {
873 sessionId: 'video-session',
874 playlistUrl: '/api/files/video-stream/video-session/master.m3u8',
875 subtitleTracks: [
876 { label: 'English', language: 'eng', default: true, src: '/api/files/video-stream/video-session/subtitle-0.vtt' },
877 { label: 'French', language: 'fra', default: false, src: '/api/files/video-stream/video-session/subtitle-1.vtt' },
878 ],
879 subtitleSummary: { total: 2, converted: 2, skipped: 0 },
880 };
881
882 const { dom, runtimeErrors } = await bootClient();
883 expect(runtimeErrors).toEqual([]);
884
885 dom.window.__mockVideoJsAudioTracks = [
886 { label: 'Stereo', enabled: false },
887 { label: 'Director commentary', enabled: true },
888 ];
889 dom.window.localStorage.setItem('filemanager.video-prefs.v1.tester', JSON.stringify({
890 subtitleTrackName: 'French',
891 audioTrackName: 'Stereo',
892 textTrackSettings: '{"color":"#ffee00"}',
893 }));
894
895 await waitFor(dom, () => !!dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]'));
896
897 const tile = dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]');
898 tile.dispatchEvent(new dom.window.MouseEvent('dblclick', { bubbles: true }));
899 await waitFor(dom, () => !!dom.window.document.querySelector('.preview-video-js'));
900
901 expect(dom.window.localStorage.getItem('vjs-text-track-settings')).toBe('{"color":"#ffee00"}');
902 expect(dom.window.__lastVideoJsTextTracks.item(0).mode).toBe('disabled');
903 expect(dom.window.__lastVideoJsTextTracks.item(1).mode).toBe('showing');
904 expect(dom.window.__lastVideoJsAudioTracks.item(0).enabled).toBe(true);
905 expect(dom.window.__lastVideoJsAudioTracks.item(1).enabled).toBe(false);
906
907 dom.window.close();
908 });
909
910 test('video preview keeps default tracks when saved names are not present', async () =>
911 {
912 listFixture['/data'] = [
913 {
914 name: 'clip.mkv',
915 path: '/data/clip.mkv',
916 isDir: false,
917 size: 64,
918 mtime: Date.now(),
919 },
920 ];
921 videoStreamFixture['/data/clip.mkv'] = {
922 sessionId: 'video-session',
923 playlistUrl: '/api/files/video-stream/video-session/master.m3u8',
924 subtitleTracks: [
925 { label: 'English', language: 'eng', default: true, src: '/api/files/video-stream/video-session/subtitle-0.vtt' },
926 { label: 'French', language: 'fra', default: false, src: '/api/files/video-stream/video-session/subtitle-1.vtt' },
927 ],
928 subtitleSummary: { total: 2, converted: 2, skipped: 0 },
929 };
930
931 const { dom, runtimeErrors } = await bootClient();
932 expect(runtimeErrors).toEqual([]);
933
934 dom.window.__mockVideoJsAudioTracks = [
935 { label: 'Stereo', enabled: false },
936 { label: 'Director commentary', enabled: true },
937 ];
938 dom.window.localStorage.setItem('filemanager.video-prefs.v1.tester', JSON.stringify({
939 subtitleTrackName: 'Spanish',
940 audioTrackName: 'Dolby Atmos',
941 }));
942
943 await waitFor(dom, () => !!dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]'));
944
945 const tile = dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]');
946 tile.dispatchEvent(new dom.window.MouseEvent('dblclick', { bubbles: true }));
947 await waitFor(dom, () => !!dom.window.document.querySelector('.preview-video-js'));
948
949 expect(dom.window.__lastVideoJsTextTracks.item(0).mode).toBe('showing');
950 expect(dom.window.__lastVideoJsTextTracks.item(1).mode).toBe('disabled');
951 expect(dom.window.__lastVideoJsAudioTracks.item(0).enabled).toBe(false);
952 expect(dom.window.__lastVideoJsAudioTracks.item(1).enabled).toBe(true);
953
954 dom.window.close();
955 });
956
957 test('video preview saves subtitle/audio track names per user when selection changes', async () =>
958 {
959 listFixture['/data'] = [
960 {
961 name: 'clip.mkv',
962 path: '/data/clip.mkv',
963 isDir: false,
964 size: 64,
965 mtime: Date.now(),
966 },
967 ];
968 videoStreamFixture['/data/clip.mkv'] = {
969 sessionId: 'video-session',
970 playlistUrl: '/api/files/video-stream/video-session/master.m3u8',
971 subtitleTracks: [
972 { label: 'English', language: 'eng', default: true, src: '/api/files/video-stream/video-session/subtitle-0.vtt' },
973 { label: 'French', language: 'fra', default: false, src: '/api/files/video-stream/video-session/subtitle-1.vtt' },
974 ],
975 subtitleSummary: { total: 2, converted: 2, skipped: 0 },
976 };
977
978 const { dom, runtimeErrors } = await bootClient();
979 expect(runtimeErrors).toEqual([]);
980
981 dom.window.__mockVideoJsAudioTracks = [
982 { label: 'Stereo', enabled: true },
983 { label: 'Director commentary', enabled: false },
984 ];
985
986 await waitFor(dom, () => !!dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]'));
987
988 const tile = dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]');
989 tile.dispatchEvent(new dom.window.MouseEvent('dblclick', { bubbles: true }));
990 await waitFor(dom, () => !!dom.window.document.querySelector('.preview-video-js'));
991
992 dom.window.__lastVideoJsTextTracks.item(0).mode = 'disabled';
993 dom.window.__lastVideoJsTextTracks.item(1).mode = 'showing';
994 dom.window.__lastVideoJsTextTracks.dispatchEvent('change');
995
996 dom.window.__lastVideoJsAudioTracks.item(0).enabled = false;
997 dom.window.__lastVideoJsAudioTracks.item(1).enabled = true;
998 dom.window.__lastVideoJsAudioTracks.dispatchEvent('change');
999
1000 const stored = JSON.parse(dom.window.localStorage.getItem('filemanager.video-prefs.v1.tester'));
1001 expect(stored.subtitleTrackName).toBe('French');
1002 expect(stored.audioTrackName).toBe('Director commentary');
1003
1004 dom.window.close();
1005 });
1006
784 test('video preview saves caption style settings per user on close', async () =>
1007 test('video preview saves caption style settings per user on close', async () =>
785 {
1008 {
786 listFixture['/data'] = [
1009 listFixture['/data'] = [