From 33185ae6f44628a403d6e2cca715c39698c2d404 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Thu, 24 Oct 2024 14:16:32 +1300 Subject: [PATCH] Fix transcript on android --- materialious/src/lib/Player.svelte | 18 +++++++++--------- materialious/src/lib/Transcript.svelte | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/materialious/src/lib/Player.svelte b/materialious/src/lib/Player.svelte index 32343b10..428564c9 100644 --- a/materialious/src/lib/Player.svelte +++ b/materialious/src/lib/Player.svelte @@ -491,15 +491,15 @@ try { toSetTime = (await getVideoProgress(data.video.videoId))[0].time; } catch {} - } - - if (get(playerSavePlaybackPositionStore)) { - try { - const playerPos = localStorage.getItem(`v_${data.video.videoId}`); - if (playerPos && Number(playerPos) > toSetTime) { - toSetTime = Number(playerPos); - } - } catch {} + } else { + if (get(playerSavePlaybackPositionStore)) { + try { + const playerPos = localStorage.getItem(`v_${data.video.videoId}`); + if (playerPos && Number(playerPos) > toSetTime) { + toSetTime = Number(playerPos); + } + } catch {} + } } if (toSetTime > 0) player.currentTime = toSetTime; diff --git a/materialious/src/lib/Transcript.svelte b/materialious/src/lib/Transcript.svelte index 5ae5351e..254777eb 100644 --- a/materialious/src/lib/Transcript.svelte +++ b/materialious/src/lib/Transcript.svelte @@ -45,7 +45,7 @@ isLoading = true; transcript = null; - const resp = await fetch(`${get(instanceStore)}${url}`); + const resp = await fetch(`${!video.fallbackPatch ? get(instanceStore) : ''}${url}`); transcript = await parseText(await resp.text(), { strict: false }); transcriptCues = transcript.cues; isLoading = false; @@ -114,7 +114,7 @@ class:secondary-container={currentTime >= cue.startTime && currentTime <= cue.endTime} >

{videoLength(cue.startTime)}

-

{decodeHtmlCharCodes(cue.text)}

+

{decodeHtmlCharCodes(cue.text.replace(/<[^>]+>/g, ''))}

{/each} {:else}