Skip to content

A self-hosted media server and file management system

feat: eager load subtitles

aminnausinc0fdb11981d3
diff --git a/app/Http/Controllers/Api/V1/FolderController.php b/app/Http/Controllers/Api/V1/FolderController.php
index 7e505329..119f0578 100755
--- a/app/Http/Controllers/Api/V1/FolderController.php
+++ b/app/Http/Controllers/Api/V1/FolderController.php
@@ -45,7 +45,9 @@ class FolderController extends Controller {
* @return \Illuminate\Http\Response
*/
public function show(Folder $folder) {
- $folder->load(['videos.metadata.videoTags.tag', 'series.folderTags.tag']);
+ $folder->load(['videos.metadata.videoTags.tag', 'series.folderTags.tag', 'videos.metadata.subtitles' => function ($q) {
+ $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.php
index b06f798c..dfba72af 100755
--- a/app/Http/Controllers/Api/V1/VideoController.php
+++ b/app/Http/Controllers/Api/V1/VideoController.php
@@ -44,6 +44,11 @@ class VideoController extends Controller {
$metadata->update(['view_count' => ($metadata->id ? Record::where('metadata_id', $metadata->id)->count() : 0) + 1]);
}
- return $this->success(new VideoResource($video->load('metadata.videoTags.tag')));
+ return $this->success(new VideoResource($video->load([
+ 'metadata.videoTags.tag',
+ 'metadata.subtitles' => function ($q) {
+ $q->select('id', 'track_id', 'metadata_uuid', 'language', 'codec',);
+ }
+ ])));
}
}
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.php
index b613a5b4..355ea8d2 100755
--- a/app/Http/Controllers/DirectoryController.php
+++ b/app/Http/Controllers/DirectoryController.php
@@ -96,7 +96,13 @@ class DirectoryController extends Controller {
}
private function loadFolderData(array $data, FolderResource $folder): array {
- $folder->load(['videos.metadata.videoTags.tag', 'series.folderTags.tag']);
+ $folder->load([
+ 'series.folderTags.tag',
+ 'videos.metadata.videoTags.tag',
+ 'videos.metadata.subtitles' => function ($q) {
+ $q->select('id', 'track_id', 'metadata_uuid', 'language', 'codec',);
+ },
+ ]);
$request = Request::create('', 'GET', ['videos' => true]);
$data['folder'] = $folder->toArray($request);
@@ -105,4 +111,5 @@ class DirectoryController extends Controller {
}
}
-class ForbiddenException extends Exception {}
+class ForbiddenException extends Exception {
+}