BlueGit

timfa filemanager

Force caption defaults and remove caption persistence

timfa Tim Falken · pushed by timfa

Authored 2026-05-08 · 6 months ago

Hash
b9d7f07c775711036fa360e3ecd7a62c0aabe656
Parent
8a4fe5a4
6 files changed +92 −78
.github/technical-reference.md +4 −4
@@ -86,7 +86,7 @@
86 86 - Standalone public share page served at /share/:token; no auth required.
87 87 - Timer bar - Live HH:MM:SS countdown showing remaining validity; turns red and disables download when expired.
88 88 - tryPreview(name, isDir) - Renders inline preview (img/video/audio/text pre); no-op for unsupported types or directories.
89 - Share video preview - Uses the same Video.js playback behaviour as app previews: VOD UI enforcement, long forward buffer, local caption-style defaults/persistence, and subtitle/audio track restore/save by matching track names when available.
89 - Share video preview - Uses the same Video.js playback behaviour as app previews: VOD UI enforcement, long forward buffer, forced caption-style defaults, and subtitle/audio track restore/save by matching track names when available.
90 90 - Fetches /api/share/info/:token on load; shows error state for 404/410 responses.
91 91 - Download link points to /api/share/download/:token; labelled "Download als .zip" for directories.
92 92
@@ -125,7 +125,7 @@
125 125 - disconnectThumbnailObserver() - Clears active IntersectionObserver when the grid is rebuilt.
126 126 - setThumbnailPending(iconEl, pending) - Toggles per-icon pending spinner state while a cached image thumbnail is not ready yet.
127 127 - buildThumbnailSource(item, blob, kind) - Produces thumbnail image source (data/blob URL) for icon injection.
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 + caption style + subtitle/audio track names when present), applies default caption style presets when no per-user caption style exists, 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/audio track names when present), forces default caption style presets on each open, reports watch progress, and warns when subtitle streams exist but none are web-compatible.
129 129 - closePreview(opts) - Closes expanded previews; video previews ignore backdrop close and require explicit close action.
130 130
131 131 ## tests/thumbnail-cache.test.js
@@ -205,8 +205,8 @@
205 205 - video preview restores saved subtitle/audio track names when available - Verifies per-user subtitle/audio selections are reapplied by matching track names.
206 206 - video preview keeps default tracks when saved names are not present - Verifies subtitle/audio defaults remain unchanged when saved names are missing.
207 207 - video preview saves subtitle/audio track names per user when selection changes - Verifies subtitle/audio selections are persisted into per-user video preferences.
208 - video preview applies default caption style per user when no saved style exists - Verifies requested caption defaults are loaded and persisted for first-use users.
209 - video preview saves caption style settings per user on close - Verifies Video.js text-track settings persist per user after closing previews.
208 - video preview applies default caption style per open - Verifies requested caption defaults are always loaded into Video.js settings.
209 - video preview does not save caption style settings per user on close - Verifies caption style changes are not persisted to per-user video preferences.
210 210
211 211 ## tests/video-stream.test.js
212 212 - createVideoStreamSession resolves once ffmpeg starts writing stream assets - Verifies session creation no longer waits for the final master playlist before preview can begin.
@@ -86,7 +86,7 @@
86- Standalone public share page served at /share/:token; no auth required.
86- Standalone public share page served at /share/:token; no auth required.
87- Timer bar - Live HH:MM:SS countdown showing remaining validity; turns red and disables download when expired.
87- Timer bar - Live HH:MM:SS countdown showing remaining validity; turns red and disables download when expired.
88- tryPreview(name, isDir) - Renders inline preview (img/video/audio/text pre); no-op for unsupported types or directories.
88- tryPreview(name, isDir) - Renders inline preview (img/video/audio/text pre); no-op for unsupported types or directories.
89- Share video preview - Uses the same Video.js playback behaviour as app previews: VOD UI enforcement, long forward buffer, local caption-style defaults/persistence, and subtitle/audio track restore/save by matching track names when available.
89- Share video preview - Uses the same Video.js playback behaviour as app previews: VOD UI enforcement, long forward buffer, forced caption-style defaults, and subtitle/audio track restore/save by matching track names when available.
90- Fetches /api/share/info/:token on load; shows error state for 404/410 responses.
90- Fetches /api/share/info/:token on load; shows error state for 404/410 responses.
91- Download link points to /api/share/download/:token; labelled "Download als .zip" for directories.
91- Download link points to /api/share/download/:token; labelled "Download als .zip" for directories.
92
92
@@ -125,7 +125,7 @@
125- disconnectThumbnailObserver() - Clears active IntersectionObserver when the grid is rebuilt.
125- disconnectThumbnailObserver() - Clears active IntersectionObserver when the grid is rebuilt.
126- setThumbnailPending(iconEl, pending) - Toggles per-icon pending spinner state while a cached image thumbnail is not ready yet.
126- setThumbnailPending(iconEl, pending) - Toggles per-icon pending spinner state while a cached image thumbnail is not ready yet.
127- buildThumbnailSource(item, blob, kind) - Produces thumbnail image source (data/blob URL) for icon injection.
127- buildThumbnailSource(item, blob, kind) - Produces thumbnail image source (data/blob URL) for icon injection.
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 + caption style + subtitle/audio track names when present), applies default caption style presets when no per-user caption style exists, 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/audio track names when present), forces default caption style presets on each open, 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.
129- closePreview(opts) - Closes expanded previews; video previews ignore backdrop close and require explicit close action.
130
130
131## tests/thumbnail-cache.test.js
131## tests/thumbnail-cache.test.js
@@ -205,8 +205,8 @@
205- 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 restores saved subtitle/audio track names when available - Verifies per-user subtitle/audio selections are reapplied by matching track names.
206- 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 keeps default tracks when saved names are not present - Verifies subtitle/audio defaults remain unchanged when saved names are missing.
207- video preview saves subtitle/audio track names per user when selection changes - Verifies subtitle/audio selections are persisted into per-user video preferences.
207- video preview saves subtitle/audio track names per user when selection changes - Verifies subtitle/audio selections are persisted into per-user video preferences.
208- video preview applies default caption style per user when no saved style exists - Verifies requested caption defaults are loaded and persisted for first-use users.
208- video preview applies default caption style per open - Verifies requested caption defaults are always loaded into Video.js settings.
209- video preview saves caption style settings per user on close - Verifies Video.js text-track settings persist per user after closing previews.
209- video preview does not save caption style settings per user on close - Verifies caption style changes are not persisted to per-user video preferences.
210
210
211## tests/video-stream.test.js
211## tests/video-stream.test.js
212- createVideoStreamSession resolves once ffmpeg starts writing stream assets - Verifies session creation no longer waits for the final master playlist before preview can begin.
212- createVideoStreamSession resolves once ffmpeg starts writing stream assets - Verifies session creation no longer waits for the final master playlist before preview can begin.
public/app.js +13 −21
@@ -65,6 +65,17 @@ const MOBILE_LONG_PRESS_MOVE_THRESHOLD = 10;
65 65 const THUMB_OBSERVER_ROOT_MARGIN = '120px';
66 66 const VIDEO_PREFS_KEY_PREFIX = 'filemanager.video-prefs.v1.';
67 67 const VIDEO_TEXT_TRACK_SETTINGS_KEY = 'vjs-text-track-settings';
68 const VIDEO_TEXT_TRACK_DEFAULT_SETTINGS_RAW = JSON.stringify({
69 color: '#fff',
70 textOpacity: '1',
71 backgroundColor: '#000',
72 backgroundOpacity: '0',
73 windowColor: '#000',
74 windowOpacity: '0',
75 fontPercent: '1.00',
76 edgeStyle: 'uniform',
77 fontFamily: 'proportionalSansSerif',
78 });
68 79 const VIDEO_FORWARD_BUFFER_SECONDS = 60 * 60;
69 80 let videoJsLoaderPromise = null;
70 81
@@ -239,26 +250,8 @@ function applyUserVideoTextTrackPrefs ()
239 250 {
240 251 try
241 252 {
242 const prefs = loadUserVideoPrefs();
243 if (typeof prefs.textTrackSettings === 'string' && prefs.textTrackSettings)
244 {
245 localStorage.setItem(VIDEO_TEXT_TRACK_SETTINGS_KEY, prefs.textTrackSettings);
246 }
247 } catch
248 {
249 // Ignore localStorage failures.
250 }
251 }
252
253 function captureUserVideoTextTrackPrefs ()
254 {
255 try
256 {
257 const raw = localStorage.getItem(VIDEO_TEXT_TRACK_SETTINGS_KEY);
258 if (typeof raw === 'string' && raw)
259 {
260 saveUserVideoPrefs({ textTrackSettings: raw });
261 }
253 // Always force known caption defaults to avoid stale user overrides.
254 localStorage.setItem(VIDEO_TEXT_TRACK_SETTINGS_KEY, VIDEO_TEXT_TRACK_DEFAULT_SETTINGS_RAW);
262 255 } catch
263 256 {
264 257 // Ignore localStorage failures.
@@ -2675,7 +2668,6 @@ async function renderStreamedVideoPreview (item, targetEl)
2675 2668 {
2676 2669 try { markWatch(); } catch { /* ignore */ }
2677 2670 try { trackPrefs.captureSelectedTracks(); } catch { /* ignore */ }
2678 captureUserVideoTextTrackPrefs();
2679 2671 try { trackPrefs.detach(); } catch { /* ignore */ }
2680 2672 try { player.dispose(); } catch { /* ignore */ }
2681 2673 };
@@ -65,6 +65,17 @@ const MOBILE_LONG_PRESS_MOVE_THRESHOLD = 10;
65const THUMB_OBSERVER_ROOT_MARGIN = '120px';
65const THUMB_OBSERVER_ROOT_MARGIN = '120px';
66const VIDEO_PREFS_KEY_PREFIX = 'filemanager.video-prefs.v1.';
66const VIDEO_PREFS_KEY_PREFIX = 'filemanager.video-prefs.v1.';
67const VIDEO_TEXT_TRACK_SETTINGS_KEY = 'vjs-text-track-settings';
67const VIDEO_TEXT_TRACK_SETTINGS_KEY = 'vjs-text-track-settings';
68const VIDEO_TEXT_TRACK_DEFAULT_SETTINGS_RAW = JSON.stringify({
69 color: '#fff',
70 textOpacity: '1',
71 backgroundColor: '#000',
72 backgroundOpacity: '0',
73 windowColor: '#000',
74 windowOpacity: '0',
75 fontPercent: '1.00',
76 edgeStyle: 'uniform',
77 fontFamily: 'proportionalSansSerif',
78});
68const VIDEO_FORWARD_BUFFER_SECONDS = 60 * 60;
79const VIDEO_FORWARD_BUFFER_SECONDS = 60 * 60;
69let videoJsLoaderPromise = null;
80let videoJsLoaderPromise = null;
70
81
@@ -239,26 +250,8 @@ function applyUserVideoTextTrackPrefs ()
239{
250{
240 try
251 try
241 {
252 {
242 const prefs = loadUserVideoPrefs();
253 // Always force known caption defaults to avoid stale user overrides.
243 if (typeof prefs.textTrackSettings === 'string' && prefs.textTrackSettings)
254 localStorage.setItem(VIDEO_TEXT_TRACK_SETTINGS_KEY, VIDEO_TEXT_TRACK_DEFAULT_SETTINGS_RAW);
244 {
245 localStorage.setItem(VIDEO_TEXT_TRACK_SETTINGS_KEY, prefs.textTrackSettings);
246 }
247 } catch
248 {
249 // Ignore localStorage failures.
250 }
251}
252
253function captureUserVideoTextTrackPrefs ()
254{
255 try
256 {
257 const raw = localStorage.getItem(VIDEO_TEXT_TRACK_SETTINGS_KEY);
258 if (typeof raw === 'string' && raw)
259 {
260 saveUserVideoPrefs({ textTrackSettings: raw });
261 }
262 } catch
255 } catch
263 {
256 {
264 // Ignore localStorage failures.
257 // Ignore localStorage failures.
@@ -2675,7 +2668,6 @@ async function renderStreamedVideoPreview (item, targetEl)
2675 {
2668 {
2676 try { markWatch(); } catch { /* ignore */ }
2669 try { markWatch(); } catch { /* ignore */ }
2677 try { trackPrefs.captureSelectedTracks(); } catch { /* ignore */ }
2670 try { trackPrefs.captureSelectedTracks(); } catch { /* ignore */ }
2678 captureUserVideoTextTrackPrefs();
2679 try { trackPrefs.detach(); } catch { /* ignore */ }
2671 try { trackPrefs.detach(); } catch { /* ignore */ }
2680 try { player.dispose(); } catch { /* ignore */ }
2672 try { player.dispose(); } catch { /* ignore */ }
2681 };
2673 };
public/share.html +2 −41
@@ -296,46 +296,8 @@
296 296 {
297 297 try
298 298 {
299 const prefs = loadShareVideoPrefs();
300 const raw = String(prefs.textTrackSettings || '');
301 let parsed = null;
302 if (raw)
303 {
304 try
305 {
306 const candidate = JSON.parse(raw);
307 if (candidate && typeof candidate === 'object' && !Array.isArray(candidate))
308 {
309 parsed = raw;
310 }
311 } catch
312 {
313 parsed = null;
314 }
315 }
316
317 const effective = parsed || VIDEO_TEXT_TRACK_DEFAULT_SETTINGS_RAW;
318 localStorage.setItem(VIDEO_TEXT_TRACK_SETTINGS_KEY, effective);
319
320 if (parsed !== effective)
321 {
322 saveShareVideoPrefs({ textTrackSettings: effective });
323 }
324 } catch
325 {
326 // Ignore localStorage failures.
327 }
328 }
329
330 function captureShareVideoTextTrackPrefs ()
331 {
332 try
333 {
334 const raw = localStorage.getItem(VIDEO_TEXT_TRACK_SETTINGS_KEY);
335 if (typeof raw === 'string' && raw)
336 {
337 saveShareVideoPrefs({ textTrackSettings: raw });
338 }
299 // Always force known caption defaults to avoid stale user overrides.
300 localStorage.setItem(VIDEO_TEXT_TRACK_SETTINGS_KEY, VIDEO_TEXT_TRACK_DEFAULT_SETTINGS_RAW);
339 301 } catch
340 302 {
341 303 // Ignore localStorage failures.
@@ -501,7 +463,6 @@
501 463 if (!shareVideoPlayer) return;
502 464
503 465 try { shareTrackPrefs && shareTrackPrefs.captureSelectedTracks(); } catch { /* ignore */ }
504 try { captureShareVideoTextTrackPrefs(); } catch { /* ignore */ }
505 466 try { shareTrackPrefs && shareTrackPrefs.detach(); } catch { /* ignore */ }
506 467 try { shareVideoPlayer.dispose(); } catch { /* ignore */ }
507 468
@@ -296,46 +296,8 @@
296 {
296 {
297 try
297 try
298 {
298 {
299 const prefs = loadShareVideoPrefs();
299 // Always force known caption defaults to avoid stale user overrides.
300 const raw = String(prefs.textTrackSettings || '');
300 localStorage.setItem(VIDEO_TEXT_TRACK_SETTINGS_KEY, VIDEO_TEXT_TRACK_DEFAULT_SETTINGS_RAW);
301 let parsed = null;
302 if (raw)
303 {
304 try
305 {
306 const candidate = JSON.parse(raw);
307 if (candidate && typeof candidate === 'object' && !Array.isArray(candidate))
308 {
309 parsed = raw;
310 }
311 } catch
312 {
313 parsed = null;
314 }
315 }
316
317 const effective = parsed || VIDEO_TEXT_TRACK_DEFAULT_SETTINGS_RAW;
318 localStorage.setItem(VIDEO_TEXT_TRACK_SETTINGS_KEY, effective);
319
320 if (parsed !== effective)
321 {
322 saveShareVideoPrefs({ textTrackSettings: effective });
323 }
324 } catch
325 {
326 // Ignore localStorage failures.
327 }
328 }
329
330 function captureShareVideoTextTrackPrefs ()
331 {
332 try
333 {
334 const raw = localStorage.getItem(VIDEO_TEXT_TRACK_SETTINGS_KEY);
335 if (typeof raw === 'string' && raw)
336 {
337 saveShareVideoPrefs({ textTrackSettings: raw });
338 }
339 } catch
301 } catch
340 {
302 {
341 // Ignore localStorage failures.
303 // Ignore localStorage failures.
@@ -501,7 +463,6 @@
501 if (!shareVideoPlayer) return;
463 if (!shareVideoPlayer) return;
502
464
503 try { shareTrackPrefs && shareTrackPrefs.captureSelectedTracks(); } catch { /* ignore */ }
465 try { shareTrackPrefs && shareTrackPrefs.captureSelectedTracks(); } catch { /* ignore */ }
504 try { captureShareVideoTextTrackPrefs(); } catch { /* ignore */ }
505 try { shareTrackPrefs && shareTrackPrefs.detach(); } catch { /* ignore */ }
466 try { shareTrackPrefs && shareTrackPrefs.detach(); } catch { /* ignore */ }
506 try { shareVideoPlayer.dispose(); } catch { /* ignore */ }
467 try { shareVideoPlayer.dispose(); } catch { /* ignore */ }
507
468
server/routes/files.js +13 −2
@@ -85,8 +85,19 @@ const storage = {
85 85 settled = true;
86 86 stopPiping();
87 87 detach();
88 out.destroy();
89 cleanup((cleanupErr) => cb(cleanupErr || err));
88
89 const finishFailure = () =>
90 {
91 cleanup((cleanupErr) => cb(cleanupErr || err));
92 };
93
94 if (out.destroyed || out.writableEnded)
95 {
96 finishFailure();
97 return;
98 }
99
100 out.end(finishFailure);
90 101 };
91 102
92 103 const succeed = () =>
@@ -85,8 +85,19 @@ const storage = {
85 settled = true;
85 settled = true;
86 stopPiping();
86 stopPiping();
87 detach();
87 detach();
88 out.destroy();
88
89 cleanup((cleanupErr) => cb(cleanupErr || err));
89 const finishFailure = () =>
90 {
91 cleanup((cleanupErr) => cb(cleanupErr || err));
92 };
93
94 if (out.destroyed || out.writableEnded)
95 {
96 finishFailure();
97 return;
98 }
99
100 out.end(finishFailure);
90 };
101 };
91
102
92 const succeed = () =>
103 const succeed = () =>
tests/page.load.test.js +59 −5
@@ -6,6 +6,18 @@ const path = require('path');
6 6 const { once } = require('events');
7 7 const { webcrypto } = require('crypto');
8 8
9 const DEFAULT_VIDEO_TEXT_TRACK_SETTINGS_RAW = JSON.stringify({
10 color: '#fff',
11 textOpacity: '1',
12 backgroundColor: '#000',
13 backgroundOpacity: '0',
14 windowColor: '#000',
15 windowOpacity: '0',
16 fontPercent: '1.00',
17 edgeStyle: 'uniform',
18 fontFamily: 'proportionalSansSerif',
19 });
20
9 21 describe('page load smoke test', () =>
10 22 {
11 23 let server;
@@ -478,6 +490,8 @@ describe('page load smoke test', () =>
478 490 });
479 491 expect(runtimeErrors).toEqual([]);
480 492
493 await waitFor(dom, () => !!dom.window.document.querySelector('.file-item[data-path="/data-a"]'));
494
481 495 const rootTile = dom.window.document.querySelector('.file-item[data-path="/data-a"]');
482 496 expect(rootTile).toBeTruthy();
483 497
@@ -889,7 +903,6 @@ describe('page load smoke test', () =>
889 903 dom.window.localStorage.setItem('filemanager.video-prefs.v1.tester', JSON.stringify({
890 904 subtitleTrackName: 'French',
891 905 audioTrackName: 'Stereo',
892 textTrackSettings: '{"color":"#ffee00"}',
893 906 }));
894 907
895 908 await waitFor(dom, () => !!dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]'));
@@ -898,7 +911,7 @@ describe('page load smoke test', () =>
898 911 tile.dispatchEvent(new dom.window.MouseEvent('dblclick', { bubbles: true }));
899 912 await waitFor(dom, () => !!dom.window.document.querySelector('.preview-video-js'));
900 913
901 expect(dom.window.localStorage.getItem('vjs-text-track-settings')).toBe('{"color":"#ffee00"}');
914 expect(dom.window.localStorage.getItem('vjs-text-track-settings')).toBe(DEFAULT_VIDEO_TEXT_TRACK_SETTINGS_RAW);
902 915 expect(dom.window.__lastVideoJsTextTracks.item(0).mode).toBe('disabled');
903 916 expect(dom.window.__lastVideoJsTextTracks.item(1).mode).toBe('showing');
904 917 expect(dom.window.__lastVideoJsAudioTracks.item(0).enabled).toBe(true);
@@ -1004,7 +1017,44 @@ describe('page load smoke test', () =>
1004 1017 dom.window.close();
1005 1018 });
1006 1019
1007 test('video preview saves caption style settings per user on close', async () =>
1020 test('video preview applies default caption style per user when no saved style exists', async () =>
1021 {
1022 listFixture['/data'] = [
1023 {
1024 name: 'clip.mkv',
1025 path: '/data/clip.mkv',
1026 isDir: false,
1027 size: 64,
1028 mtime: Date.now(),
1029 },
1030 ];
1031 videoStreamFixture['/data/clip.mkv'] = {
1032 sessionId: 'video-session',
1033 playlistUrl: '/api/files/video-stream/video-session/master.m3u8',
1034 subtitleTracks: [{ label: 'English', language: 'eng', default: true, src: '/api/files/video-stream/video-session/subtitle-0.vtt' }],
1035 subtitleSummary: { total: 1, converted: 1, skipped: 0 },
1036 };
1037
1038 const { dom, runtimeErrors } = await bootClient();
1039 expect(runtimeErrors).toEqual([]);
1040
1041 await waitFor(dom, () => !!dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]'));
1042 const tile = dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]');
1043 tile.dispatchEvent(new dom.window.MouseEvent('dblclick', { bubbles: true }));
1044 await waitFor(dom, () => !!dom.window.document.querySelector('.preview-video-js'));
1045
1046 expect(dom.window.localStorage.getItem('vjs-text-track-settings')).toBe(DEFAULT_VIDEO_TEXT_TRACK_SETTINGS_RAW);
1047 const storedRaw = dom.window.localStorage.getItem('filemanager.video-prefs.v1.tester');
1048 if (storedRaw)
1049 {
1050 const stored = JSON.parse(storedRaw);
1051 expect(stored.textTrackSettings).toBeUndefined();
1052 }
1053
1054 dom.window.close();
1055 });
1056
1057 test('video preview does not save caption style settings per user on close', async () =>
1008 1058 {
1009 1059 listFixture['/data'] = [
1010 1060 {
@@ -1037,8 +1087,12 @@ describe('page load smoke test', () =>
1037 1087 closeBtn.dispatchEvent(new dom.window.MouseEvent('click', { bubbles: true }));
1038 1088 await new Promise(resolve => dom.window.setTimeout(resolve, 280));
1039 1089
1040 const stored = JSON.parse(dom.window.localStorage.getItem('filemanager.video-prefs.v1.tester'));
1041 expect(stored.textTrackSettings).toBe('{"color":"#ffffff"}');
1090 const storedRaw = dom.window.localStorage.getItem('filemanager.video-prefs.v1.tester');
1091 if (storedRaw)
1092 {
1093 const stored = JSON.parse(storedRaw);
1094 expect(stored.textTrackSettings).toBeUndefined();
1095 }
1042 1096
1043 1097 dom.window.close();
1044 1098 });
@@ -6,6 +6,18 @@ const path = require('path');
6const { once } = require('events');
6const { once } = require('events');
7const { webcrypto } = require('crypto');
7const { webcrypto } = require('crypto');
8
8
9const DEFAULT_VIDEO_TEXT_TRACK_SETTINGS_RAW = JSON.stringify({
10 color: '#fff',
11 textOpacity: '1',
12 backgroundColor: '#000',
13 backgroundOpacity: '0',
14 windowColor: '#000',
15 windowOpacity: '0',
16 fontPercent: '1.00',
17 edgeStyle: 'uniform',
18 fontFamily: 'proportionalSansSerif',
19});
20
9describe('page load smoke test', () =>
21describe('page load smoke test', () =>
10{
22{
11 let server;
23 let server;
@@ -478,6 +490,8 @@ describe('page load smoke test', () =>
478 });
490 });
479 expect(runtimeErrors).toEqual([]);
491 expect(runtimeErrors).toEqual([]);
480
492
493 await waitFor(dom, () => !!dom.window.document.querySelector('.file-item[data-path="/data-a"]'));
494
481 const rootTile = dom.window.document.querySelector('.file-item[data-path="/data-a"]');
495 const rootTile = dom.window.document.querySelector('.file-item[data-path="/data-a"]');
482 expect(rootTile).toBeTruthy();
496 expect(rootTile).toBeTruthy();
483
497
@@ -889,7 +903,6 @@ describe('page load smoke test', () =>
889 dom.window.localStorage.setItem('filemanager.video-prefs.v1.tester', JSON.stringify({
903 dom.window.localStorage.setItem('filemanager.video-prefs.v1.tester', JSON.stringify({
890 subtitleTrackName: 'French',
904 subtitleTrackName: 'French',
891 audioTrackName: 'Stereo',
905 audioTrackName: 'Stereo',
892 textTrackSettings: '{"color":"#ffee00"}',
893 }));
906 }));
894
907
895 await waitFor(dom, () => !!dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]'));
908 await waitFor(dom, () => !!dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]'));
@@ -898,7 +911,7 @@ describe('page load smoke test', () =>
898 tile.dispatchEvent(new dom.window.MouseEvent('dblclick', { bubbles: true }));
911 tile.dispatchEvent(new dom.window.MouseEvent('dblclick', { bubbles: true }));
899 await waitFor(dom, () => !!dom.window.document.querySelector('.preview-video-js'));
912 await waitFor(dom, () => !!dom.window.document.querySelector('.preview-video-js'));
900
913
901 expect(dom.window.localStorage.getItem('vjs-text-track-settings')).toBe('{"color":"#ffee00"}');
914 expect(dom.window.localStorage.getItem('vjs-text-track-settings')).toBe(DEFAULT_VIDEO_TEXT_TRACK_SETTINGS_RAW);
902 expect(dom.window.__lastVideoJsTextTracks.item(0).mode).toBe('disabled');
915 expect(dom.window.__lastVideoJsTextTracks.item(0).mode).toBe('disabled');
903 expect(dom.window.__lastVideoJsTextTracks.item(1).mode).toBe('showing');
916 expect(dom.window.__lastVideoJsTextTracks.item(1).mode).toBe('showing');
904 expect(dom.window.__lastVideoJsAudioTracks.item(0).enabled).toBe(true);
917 expect(dom.window.__lastVideoJsAudioTracks.item(0).enabled).toBe(true);
@@ -1004,7 +1017,44 @@ describe('page load smoke test', () =>
1004 dom.window.close();
1017 dom.window.close();
1005 });
1018 });
1006
1019
1007 test('video preview saves caption style settings per user on close', async () =>
1020 test('video preview applies default caption style per user when no saved style exists', async () =>
1021 {
1022 listFixture['/data'] = [
1023 {
1024 name: 'clip.mkv',
1025 path: '/data/clip.mkv',
1026 isDir: false,
1027 size: 64,
1028 mtime: Date.now(),
1029 },
1030 ];
1031 videoStreamFixture['/data/clip.mkv'] = {
1032 sessionId: 'video-session',
1033 playlistUrl: '/api/files/video-stream/video-session/master.m3u8',
1034 subtitleTracks: [{ label: 'English', language: 'eng', default: true, src: '/api/files/video-stream/video-session/subtitle-0.vtt' }],
1035 subtitleSummary: { total: 1, converted: 1, skipped: 0 },
1036 };
1037
1038 const { dom, runtimeErrors } = await bootClient();
1039 expect(runtimeErrors).toEqual([]);
1040
1041 await waitFor(dom, () => !!dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]'));
1042 const tile = dom.window.document.querySelector('.file-item[data-path="/data/clip.mkv"]');
1043 tile.dispatchEvent(new dom.window.MouseEvent('dblclick', { bubbles: true }));
1044 await waitFor(dom, () => !!dom.window.document.querySelector('.preview-video-js'));
1045
1046 expect(dom.window.localStorage.getItem('vjs-text-track-settings')).toBe(DEFAULT_VIDEO_TEXT_TRACK_SETTINGS_RAW);
1047 const storedRaw = dom.window.localStorage.getItem('filemanager.video-prefs.v1.tester');
1048 if (storedRaw)
1049 {
1050 const stored = JSON.parse(storedRaw);
1051 expect(stored.textTrackSettings).toBeUndefined();
1052 }
1053
1054 dom.window.close();
1055 });
1056
1057 test('video preview does not save caption style settings per user on close', async () =>
1008 {
1058 {
1009 listFixture['/data'] = [
1059 listFixture['/data'] = [
1010 {
1060 {
@@ -1037,8 +1087,12 @@ describe('page load smoke test', () =>
1037 closeBtn.dispatchEvent(new dom.window.MouseEvent('click', { bubbles: true }));
1087 closeBtn.dispatchEvent(new dom.window.MouseEvent('click', { bubbles: true }));
1038 await new Promise(resolve => dom.window.setTimeout(resolve, 280));
1088 await new Promise(resolve => dom.window.setTimeout(resolve, 280));
1039
1089
1040 const stored = JSON.parse(dom.window.localStorage.getItem('filemanager.video-prefs.v1.tester'));
1090 const storedRaw = dom.window.localStorage.getItem('filemanager.video-prefs.v1.tester');
1041 expect(stored.textTrackSettings).toBe('{"color":"#ffffff"}');
1091 if (storedRaw)
1092 {
1093 const stored = JSON.parse(storedRaw);
1094 expect(stored.textTrackSettings).toBeUndefined();
1095 }
1042
1096
1043 dom.window.close();
1097 dom.window.close();
1044 });
1098 });
tests/share.page.load.test.js +1 −5
@@ -291,9 +291,6 @@ describe('share page video preview', () =>
291 291 expect(runtimeErrors).toEqual([]);
292 292 expect(dom.window.localStorage.getItem('vjs-text-track-settings')).toBe(DEFAULT_VIDEO_TEXT_TRACK_SETTINGS_RAW);
293 293
294 const storedPrefs = JSON.parse(dom.window.localStorage.getItem(SHARE_VIDEO_PREFS_KEY));
295 expect(storedPrefs.textTrackSettings).toBe(DEFAULT_VIDEO_TEXT_TRACK_SETTINGS_RAW);
296
297 294 dom.window.close();
298 295 });
299 296
@@ -303,7 +300,6 @@ describe('share page video preview', () =>
303 300 subtitleTrackName: 'French',
304 301 audioTrackName: 'Stereo',
305 302 volume: 0.35,
306 textTrackSettings: '{"color":"#ffee00"}',
307 303 };
308 304
309 305 const { dom, runtimeErrors } = await bootSharePage();
@@ -311,7 +307,7 @@ describe('share page video preview', () =>
311 307 await waitFor(dom, () => !!dom.window.document.querySelector('#preview-wrap .video-js'));
312 308
313 309 expect(runtimeErrors).toEqual([]);
314 expect(dom.window.localStorage.getItem('vjs-text-track-settings')).toBe('{"color":"#ffee00"}');
310 expect(dom.window.localStorage.getItem('vjs-text-track-settings')).toBe(DEFAULT_VIDEO_TEXT_TRACK_SETTINGS_RAW);
315 311 expect(dom.window.__lastVideoJsVolumeSet).toBe(0.35);
316 312
317 313 expect(dom.window.__lastVideoJsTextTracks.item(0).mode).toBe('disabled');
@@ -291,9 +291,6 @@ describe('share page video preview', () =>
291 expect(runtimeErrors).toEqual([]);
291 expect(runtimeErrors).toEqual([]);
292 expect(dom.window.localStorage.getItem('vjs-text-track-settings')).toBe(DEFAULT_VIDEO_TEXT_TRACK_SETTINGS_RAW);
292 expect(dom.window.localStorage.getItem('vjs-text-track-settings')).toBe(DEFAULT_VIDEO_TEXT_TRACK_SETTINGS_RAW);
293
293
294 const storedPrefs = JSON.parse(dom.window.localStorage.getItem(SHARE_VIDEO_PREFS_KEY));
295 expect(storedPrefs.textTrackSettings).toBe(DEFAULT_VIDEO_TEXT_TRACK_SETTINGS_RAW);
296
297 dom.window.close();
294 dom.window.close();
298 });
295 });
299
296
@@ -303,7 +300,6 @@ describe('share page video preview', () =>
303 subtitleTrackName: 'French',
300 subtitleTrackName: 'French',
304 audioTrackName: 'Stereo',
301 audioTrackName: 'Stereo',
305 volume: 0.35,
302 volume: 0.35,
306 textTrackSettings: '{"color":"#ffee00"}',
307 };
303 };
308
304
309 const { dom, runtimeErrors } = await bootSharePage();
305 const { dom, runtimeErrors } = await bootSharePage();
@@ -311,7 +307,7 @@ describe('share page video preview', () =>
311 await waitFor(dom, () => !!dom.window.document.querySelector('#preview-wrap .video-js'));
307 await waitFor(dom, () => !!dom.window.document.querySelector('#preview-wrap .video-js'));
312
308
313 expect(runtimeErrors).toEqual([]);
309 expect(runtimeErrors).toEqual([]);
314 expect(dom.window.localStorage.getItem('vjs-text-track-settings')).toBe('{"color":"#ffee00"}');
310 expect(dom.window.localStorage.getItem('vjs-text-track-settings')).toBe(DEFAULT_VIDEO_TEXT_TRACK_SETTINGS_RAW);
315 expect(dom.window.__lastVideoJsVolumeSet).toBe(0.35);
311 expect(dom.window.__lastVideoJsVolumeSet).toBe(0.35);
316
312
317 expect(dom.window.__lastVideoJsTextTracks.item(0).mode).toBe('disabled');
313 expect(dom.window.__lastVideoJsTextTracks.item(0).mode).toBe('disabled');