A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
chore: pint
aminnausin5800493036b7
diff --git a/app/Http/Controllers/Api/V1/FolderController.php b/app/Http/Controllers/Api/V1/FolderController.phpindex 119f0578..0d234649 100755--- a/app/Http/Controllers/Api/V1/FolderController.php+++ b/app/Http/Controllers/Api/V1/FolderController.php@@ -46,8 +46,8 @@ class FolderController extends Controller {*/public function show(Folder $folder) {$folder->load(['videos.metadata.videoTags.tag', 'series.folderTags.tag', 'videos.metadata.subtitles' => function ($q) {- $q->select('id', 'track_id', 'metadata_uuid', 'language', 'codec',);- },]);+ $q->select('id', 'track_id', 'metadata_uuid', 'language', 'codec');+ }, ]);return new FolderResource($folder);}diff --git a/app/Http/Controllers/Api/V1/VideoController.php b/app/Http/Controllers/Api/V1/VideoController.phpindex dfba72af..b25cfc5e 100755--- a/app/Http/Controllers/Api/V1/VideoController.php+++ b/app/Http/Controllers/Api/V1/VideoController.php@@ -47,8 +47,8 @@ class VideoController extends Controller {return $this->success(new VideoResource($video->load(['metadata.videoTags.tag','metadata.subtitles' => function ($q) {- $q->select('id', 'track_id', 'metadata_uuid', 'language', 'codec',);- }+ $q->select('id', 'track_id', 'metadata_uuid', 'language', 'codec');+ },])));}}diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.phpindex 355ea8d2..373d005b 100755--- a/app/Http/Controllers/DirectoryController.php+++ b/app/Http/Controllers/DirectoryController.php@@ -100,7 +100,7 @@ class DirectoryController extends Controller {'series.folderTags.tag','videos.metadata.videoTags.tag','videos.metadata.subtitles' => function ($q) {- $q->select('id', 'track_id', 'metadata_uuid', 'language', 'codec',);+ $q->select('id', 'track_id', 'metadata_uuid', 'language', 'codec');},]);@@ -111,5 +111,4 @@ class DirectoryController extends Controller {}}-class ForbiddenException extends Exception {-}+class ForbiddenException extends Exception {}diff --git a/app/Http/Resources/VideoResource.php b/app/Http/Resources/VideoResource.phpindex 5ea6b08e..943e95da 100755--- a/app/Http/Resources/VideoResource.php+++ b/app/Http/Resources/VideoResource.php@@ -42,7 +42,7 @@ class VideoResource extends JsonResource {'date_released' => $metadata?->date_released ?: null, // User Provided Release Date'date_uploaded' => $metadata?->date_uploaded ?: null, // File Last Modified (Should be date_added)'metadata' => $metadata,- 'subtitles' => SubtitleResource::collection($metadata->subtitles ?? [])+ 'subtitles' => SubtitleResource::collection($metadata->subtitles ?? []),];}}diff --git a/routes/web.php b/routes/web.phpindex e98ce3fa..5ce6af9b 100755--- a/routes/web.php+++ b/routes/web.php@@ -1,5 +1,6 @@<?php+use App\Http\Controllers\Api\V1\Metadata\SubtitleController;use App\Http\Controllers\MediaController;use App\Http\Middleware\MetadataSSR;use App\Models\Category;@@ -43,6 +44,8 @@ Route::get('/metadata/{path}', function (string $path) {);})->where('path', '.*');+Route::get('/data/subtitles/{metadata:uuid}/{track}.{format?}', [SubtitleController::class, 'show'])->where('format', 'vtt|srt|json');+Route::get('/data/{path}', function (string $path) {$path = 'data/' . $path;