Skip to content

A self-hosted media server and file management system

fix: 500 Error if external subtitle file no longer exists Fixes #293

aminnausin38707250bf74
diff --git a/app/Services/Subtitles/SubtitleResolver.php b/app/Services/Subtitles/SubtitleResolver.php
index da6a8030..e4bc33f9 100644
--- a/app/Services/Subtitles/SubtitleResolver.php
+++ b/app/Services/Subtitles/SubtitleResolver.php
@@ -78,6 +78,11 @@ class SubtitleResolver {
if (! $sourcePath) {
throw new InvalidArgumentException('Subtitle has no external source path');
}
+
+ if (! Storage::disk('public')->exists($sourcePath)) {
+ abort(404, 'External subtitle file does not exist');
+ }
+
$ext = pathinfo($sourcePath, PATHINFO_EXTENSION);
$outputPath = $subtitle->getFilePath($ext, $subtitle->language);
diff --git a/resources/js/components/video/subtitles/PlayerSubtitles.vue b/resources/js/components/video/subtitles/PlayerSubtitles.vue
index 38d51c77..bede5d8e 100644
--- a/resources/js/components/video/subtitles/PlayerSubtitles.vue
+++ b/resources/js/components/video/subtitles/PlayerSubtitles.vue
@@ -6,8 +6,8 @@ import type { Ref } from 'vue';
import { computed, inject, nextTick, onMounted, onUnmounted, ref, useTemplateRef } from 'vue';
import { useContentStore } from '@/stores/ContentStore';
import { storeToRefs } from 'pinia';
+import { cn, toast } from '@aminnausin/cedar-ui';
import { round } from 'lodash-es';
-import { cn } from '@aminnausin/cedar-ui';
import useOctopusRenderer from '@/components/video/subtitles/OctopusRenderer';
import VideoPopoverSlider from '@/components/video/VideoPopoverSlider.vue';
@@ -136,7 +136,7 @@ const handleSubtitles = (track?: SubtitleResource) => {
handleNativeSubtitles(nextTrack);
};
-const handleNativeSubtitles = async (trackData: SubtitleResource) => {
+const handleNativeSubtitles = async (nextTrack: SubtitleResource) => {
if (!player?.value) return;
const existingTrack = player.value.querySelector('track[kind="subtitles"]') as HTMLTrackElement;
@@ -154,11 +154,22 @@ const handleNativeSubtitles = async (trackData: SubtitleResource) => {
}
const track = document.createElement('track');
+ const trackTitle = nextTrack.title ? `Title: ${nextTrack.title}\n${currentUrl}` : `Track: ${nextTrack.track_id}`;
+
track.kind = 'subtitles';
- track.label = trackData.title ?? 'und';
- track.srclang = trackData.language ?? 'und';
+ track.label = nextTrack.title ?? 'und';
+ track.srclang = nextTrack.language ?? 'und';
track.src = currentSubtitleTrackUrl.value;
- track.default = trackData.is_default;
+ track.default = nextTrack.is_default;
+
+ track.addEventListener('error', () => {
+ toast.error('Failed to load subtitles', { description: trackTitle });
+ console.error('Failed to load subtitle track:', currentUrl);
+ });
+
+ track.addEventListener('load', () => {
+ toast.success('Loaded subtitles', { description: trackTitle });
+ });
player.value.appendChild(track);
};