A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: subtitle title info
aminnausinb068d767571d
diff --git a/app/Http/Resources/SubtitleResource.php b/app/Http/Resources/SubtitleResource.phpindex 28660711..bb844148 100644--- a/app/Http/Resources/SubtitleResource.php+++ b/app/Http/Resources/SubtitleResource.php@@ -17,6 +17,7 @@ class SubtitleResource extends JsonResource {'track_id' => $this->track_id,'metadata_uuid' => $this->metadata_uuid,'language' => $this->language,+ 'title' => $this->title,'codec' => $this->codec,'is_default' => $this->is_default,'is_forced' => $this->is_forced,diff --git a/app/Jobs/VerifyFiles.php b/app/Jobs/VerifyFiles.phpindex 1773b954..4cfd6526 100755--- a/app/Jobs/VerifyFiles.php+++ b/app/Jobs/VerifyFiles.php@@ -372,7 +372,7 @@ class VerifyFiles extends ManagedSubTask {$summary = 'Updated ' . count($metadataTransactions) . ' videos from id ' . ($metadataTransactions[0]['video_id']) . ' to ' . ($metadataTransactions[count($metadataTransactions) - 1]['video_id']);if (! empty($subtitleTransactions)) {- Subtitle::upsert($subtitleTransactions, ['metadata_uuid', 'source_key'], ['language', 'codec', 'is_default', 'is_forced', 'external_path']);+ Subtitle::upsert($subtitleTransactions, ['metadata_uuid', 'source_key'], ['language', 'title', 'codec', 'is_default', 'is_forced', 'external_path']);$summary .= ' and found ' . count($subtitleTransactions) . ' subtitle track(s)';}diff --git a/app/Models/Subtitle.php b/app/Models/Subtitle.phpindex 24619f32..171cf3ad 100644--- a/app/Models/Subtitle.php+++ b/app/Models/Subtitle.php@@ -13,6 +13,7 @@ class Subtitle extends Model {protected $fillable = ['track_id','language',+ 'title','codec','format','path',@@ -33,6 +34,6 @@ class Subtitle extends Model {}public static function getVisibleFields(): array {- return ['id', 'track_id', 'metadata_uuid', 'language', 'codec', 'is_default', 'is_forced'];+ return ['id', 'track_id', 'metadata_uuid', 'language', 'title', 'codec', 'is_default', 'is_forced'];}}diff --git a/app/Services/Subtitles/SubtitleScanner.php b/app/Services/Subtitles/SubtitleScanner.phpindex 11c15108..7066723c 100644--- a/app/Services/Subtitles/SubtitleScanner.php+++ b/app/Services/Subtitles/SubtitleScanner.php@@ -39,6 +39,7 @@ class SubtitleScanner {'metadata_uuid' => $uuid,'track_id' => $stream['index'], // is 0 if external'language' => $stream['tags']['language'] ?? 'und',+ 'title' => $stream['tags']['title'] ?? null,'codec' => $stream['codec_name'],'is_default' => ($stream['disposition']['default'] ?? 0) === 1,'is_forced' => ($stream['disposition']['forced'] ?? 0) === 1,@@ -101,6 +102,7 @@ class SubtitleScanner {'codec_name' => $this->getCodecFromExtension($extension),'tags' => ['language' => $language,+ 'title' => null,],'disposition' => ['forced' => $isForced ? 1 : 0,diff --git a/database/migrations/2026_02_23_193753_add_title_to_subtitles.php b/database/migrations/2026_02_23_193753_add_title_to_subtitles.phpnew file mode 100644index 00000000..65142aae--- /dev/null+++ b/database/migrations/2026_02_23_193753_add_title_to_subtitles.php@@ -0,0 +1,32 @@+<?php++use Illuminate\Database\Migrations\Migration;+use Illuminate\Database\Schema\Blueprint;+use Illuminate\Support\Facades\DB;+use Illuminate\Support\Facades\Schema;++return new class extends Migration {+ /**+ * Run the migrations.+ */+ public function up(): void {+ Schema::table('subtitles', function (Blueprint $table) {+ $table->text('title')->nullable();+ });++ DB::table('metadata')->whereExists(function ($query) {+ $query->select(DB::raw(1))+ ->from('subtitles')+ ->whereColumn('subtitles.metadata_uuid', 'metadata.uuid');+ })->update(['subtitles_scanned_at' => null]);+ }++ /**+ * Reverse the migrations.+ */+ public function down(): void {+ Schema::table('subtitles', function (Blueprint $table) {+ $table->dropColumn('title');+ });+ }+};diff --git a/resources/js/components/video/subtitles/OctopusRenderer.ts b/resources/js/components/video/subtitles/OctopusRenderer.tsindex 78db0c80..cba9d1f0 100644--- a/resources/js/components/video/subtitles/OctopusRenderer.ts+++ b/resources/js/components/video/subtitles/OctopusRenderer.ts@@ -1,4 +1,5 @@import type { SubtitlesOctopusOptions } from '@jellyfin/libass-wasm';+import type { SubtitleResource } from '@/contracts/media';import type SubtitlesOctopus from '@jellyfin/libass-wasm';import { toast } from '@aminnausin/cedar-ui';@@ -7,18 +8,22 @@ import { ref } from 'vue';export default function useOctopusRenderer() {const assInstance = ref<SubtitlesOctopus | null>(null);- const instantiateOctopus = async (subUrl: string, language?: string, frameRate?: number) => {+ const instantiateOctopus = async (nextTrack: SubtitleResource, frameRate?: number) => {const video = document.getElementById('video-source') as HTMLVideoElement;if (!video) return;if (assInstance.value) clearOctopus();- const baseFonts = ['/fonts/Rubik-Regular.ttf']; // Latin, Arabic, Cyrillic- const supplementalFonts = generateLanguageFonts(language);+ const languageTag = nextTrack.track_id === 0 ? `.${nextTrack.language}` : '';+ const subUrl = `/data/subtitles/${nextTrack.metadata_uuid}/${nextTrack.track_id}${languageTag}.ass`;+ const baseFonts = ['/fonts/Rubik-Regular.ttf', '/fonts/KleeOne-Regular.ttf']; // Latin, Arabic, Cyrillic+ const supplementalFonts = generateLanguageFonts(nextTrack.language);++ const trackTitle = nextTrack.title ? formatSubtitleTitle(nextTrack.title) : `subtitles track ${nextTrack.track_id}`;await toast.promise(fetch(subUrl), {- loading: 'Loading subtitle track...',- success: 'Track loaded',- error: 'Failed to load subtitle track',+ loading: `Loading ${trackTitle}...`,+ success: `Loaded ${trackTitle}`,+ error: `Failed to load ${trackTitle}`,});import('@jellyfin/libass-wasm').then(({ default: SubtitlesOctopus }) => {@@ -72,6 +77,11 @@ export default function useOctopusRenderer() {}};+ const formatSubtitleTitle = (title: string): string => {+ if (title.toLowerCase().includes('subtitles')) return title;+ return `${title} subtitles`;+ };+return {instantiateOctopus,clearOctopus,diff --git a/resources/js/components/video/subtitles/PlayerSubtitles.vue b/resources/js/components/video/subtitles/PlayerSubtitles.vueindex dadba8d9..28d74f24 100644--- a/resources/js/components/video/subtitles/PlayerSubtitles.vue+++ b/resources/js/components/video/subtitles/PlayerSubtitles.vue@@ -48,7 +48,7 @@ const playerSubtitleItems = computed(() => {const items: PopoverItem[] = stateVideo.value.subtitles.map((track) => {const isCurrentTrack = isShowingSubtitles.value && currentSubtitleTrack.value?.track_id === track.track_id;- const lang = track.language ?? 'Und';+ const lang = track.language ?? 'und';const isDefault = track.is_default ? '[default]' : null;const isForced = track.is_forced ? '[forced]' : null;const isExternal = track.track_id === 0 ? '[external]' : '';@@ -60,7 +60,7 @@ const playerSubtitleItems = computed(() => {return {icon: LucideCaptions,text,- title: [text, `Track: ${track.track_id}`, `Codec: ${codec}`].join('\n'),+ title: [text, `Title: ${track.title ?? 'und'}`, `Track: ${track.track_id}`, `Codec: ${codec}`].join('\n'),selected: isCurrentTrack,selectedIcon: ProiconsCheckmark,selectedIconStyle: 'text-primary',@@ -127,8 +127,7 @@ const handleSubtitles = async (track?: SubtitleResource) => {currentSubtitleTrack.value = nextTrack;if (nextTrack?.codec === 'ass') {- const languageTag = nextTrack.track_id === 0 ? `.${nextTrack.language}` : '';- instantiateOctopus(`/data/subtitles/${nextTrack.metadata_uuid}/${nextTrack.track_id}${languageTag}.ass`, nextTrack.language, stateVideo.value.metadata?.frame_rate);+ instantiateOctopus(nextTrack, stateVideo.value.metadata?.frame_rate);hideAllTracks();return;}diff --git a/resources/js/contracts/media.ts b/resources/js/contracts/media.tsindex eed9a545..af21ece6 100644--- a/resources/js/contracts/media.ts+++ b/resources/js/contracts/media.ts@@ -116,6 +116,7 @@ export interface SubtitleResource {track_id: number;metadata_uuid: string;language?: string;+ title?: string;codec?: string;is_default: boolean;is_forced: boolean;diff --git a/tests/Unit/Services/Subtitles/SubtitleScannerTest.php b/tests/Unit/Services/Subtitles/SubtitleScannerTest.phpindex 39cc8f7e..af448527 100644--- a/tests/Unit/Services/Subtitles/SubtitleScannerTest.php+++ b/tests/Unit/Services/Subtitles/SubtitleScannerTest.php@@ -37,7 +37,7 @@ class SubtitleScannerTest extends TestCase {['index' => 2,'codec_name' => 'subrip',- 'tags' => ['language' => 'eng'],+ 'tags' => ['language' => 'eng', 'title' => 'fansub'],'disposition' => ['default' => 1, 'forced' => 0],],];@@ -49,6 +49,7 @@ class SubtitleScannerTest extends TestCase {'metadata_uuid' => 'uuid','track_id' => 2,'language' => 'eng',+ 'title' => 'fansub','codec' => 'subrip','is_default' => true,'is_forced' => false,