Skip to content

A self-hosted media server and file management system

fix video tag n+1 queries when number of videos is large (fix eager loading of tags)

aminnausine72d1a14d38d
diff --git a/app/Http/Controllers/Api/V1/CategoryController.php b/app/Http/Controllers/Api/V1/CategoryController.php
index 903d32f5..70d44a57 100755
--- a/app/Http/Controllers/Api/V1/CategoryController.php
+++ b/app/Http/Controllers/Api/V1/CategoryController.php
@@ -29,7 +29,7 @@ class CategoryController extends Controller {
return $this->success(
CategoryResource::collection(
- $categories->get()
+ $categories->with(['folders.series'])->get()
)
);
} catch (\Throwable $th) {
@@ -45,6 +45,7 @@ class CategoryController extends Controller {
* @return \Illuminate\Http\Response
*/
public function show(Category $category) {
+ $category->load(['folders.series']);
return new CategoryResource($category);
}
diff --git a/app/Http/Controllers/Api/V1/FolderController.php b/app/Http/Controllers/Api/V1/FolderController.php
index 97d7d0b6..e11a40e0 100755
--- a/app/Http/Controllers/Api/V1/FolderController.php
+++ b/app/Http/Controllers/Api/V1/FolderController.php
@@ -29,7 +29,7 @@ class FolderController extends Controller {
try {
return $this->success(
FolderResource::collection(
- Folder::with(['videos.metadata', 'series'])->where('category_id', $validated['category_id'])->orderBy('id')->get()
+ Folder::with(['series'])->where('category_id', $validated['category_id'])->orderBy('id')->get() // do not eager load videos... because in this instance, the request is not asking for videos, simply a list of folders
)
);
} catch (\Throwable $th) {
@@ -45,7 +45,7 @@ class FolderController extends Controller {
* @return \Illuminate\Http\Response
*/
public function show(Folder $folder) {
- $folder->load(['videos.metadata', 'series']);
+ $folder->load(['videos.metadata.videoTags.tag', 'series']);
return new FolderResource($folder);
}
diff --git a/app/Http/Controllers/Api/V1/MetadataController.php b/app/Http/Controllers/Api/V1/MetadataController.php
index 91438f37..6a61ef8d 100644
--- a/app/Http/Controllers/Api/V1/MetadataController.php
+++ b/app/Http/Controllers/Api/V1/MetadataController.php
@@ -19,7 +19,7 @@ class MetadataController extends Controller {
public function show($id) {
try {
return $this->success(
- new MetadataResource(Metadata::where('id', $id)->first())
+ new MetadataResource(Metadata::with(['videoTags.tag'])->where('id', $id)->first())
);
} catch (\Throwable $th) {
return $this->error(null, 'Unable to get data. Error: ' . $th->getMessage(), 500);
diff --git a/app/Http/Controllers/Api/V1/PlaybackController.php b/app/Http/Controllers/Api/V1/PlaybackController.php
index 5fd71ec7..1d8ab1c0 100644
--- a/app/Http/Controllers/Api/V1/PlaybackController.php
+++ b/app/Http/Controllers/Api/V1/PlaybackController.php
@@ -18,10 +18,9 @@ class PlaybackController extends Controller {
/**
* Display a listing of the resource.
* Get all playback data points from metadata ID for a video
+ * Ordered By Progress 0 -> 100
*/
public function show(int $id) {
- // $request->query('param');
-
try {
return Playback::where('metadata_id', $id)->oldest('progress')->get();
} catch (\Throwable $th) {
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.php
index c88a04ba..a29f5ad4 100755
--- a/app/Http/Controllers/DirectoryController.php
+++ b/app/Http/Controllers/DirectoryController.php
@@ -79,7 +79,7 @@ class DirectoryController extends Controller {
return $this->error(['categoryName' => $dir, 'folderName' => $folderName], 'Cannot find folder in specified category', 404);
}
- $folderRaw->load(['videos.metadata.videoTags']);
+ $folderRaw->load(['videos.metadata.videoTags.tag']);
$videoList = VideoResource::collection($folderRaw->videos); // VideoResource::collection(Video::where('folder_id', $folderRaw->id)->get());
$data['folder'] = ['id' => $folderRaw->id, 'name' => $folderRaw->name, 'videos' => $videoList, 'series' => $data['dir']['folders']->first(function ($folder) use ($folderRaw) {
diff --git a/app/Http/Resources/VideoResource.php b/app/Http/Resources/VideoResource.php
index e81a0dca..0c9ec160 100755
--- a/app/Http/Resources/VideoResource.php
+++ b/app/Http/Resources/VideoResource.php
@@ -12,7 +12,7 @@ class VideoResource extends JsonResource {
* @return array<string, mixed>
*/
public function toArray(Request $request): array {
- $metadata = $this->metadata;
+ $metadata = $this->whenLoaded('metadata');
return [
'id' => (string) $this->id,
@@ -26,7 +26,10 @@ class VideoResource extends JsonResource {
'season' => $metadata?->season ?: $this->season,
'view_count' => $metadata?->view_count ?: $this->view_count,
'file_size' => $metadata?->file_size ?: null,
- 'video_tags' => VideoTagResource::collection($metadata?->videotags ?: []),
+ 'video_tags' => $this->whenLoaded(
+ 'metadata',
+ fn() => VideoTagResource::collection($metadata->videoTags)
+ ),
'date_released' => $metadata?->date_released ?: null,
'date_updated' => $metadata?->updated_at ?: null,
'date_uploaded' => $metadata?->date_uploaded ?: null,
diff --git a/app/Http/Resources/VideoTagResource.php b/app/Http/Resources/VideoTagResource.php
index a4b68e16..18636a0c 100644
--- a/app/Http/Resources/VideoTagResource.php
+++ b/app/Http/Resources/VideoTagResource.php
@@ -6,7 +6,7 @@ use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
class VideoTagResource extends JsonResource {
- protected static $tagCache = [];
+ // protected static $tagCache = [];
/**
* Transform the resource into an array.
@@ -14,18 +14,18 @@ class VideoTagResource extends JsonResource {
* @return array<string, mixed>
*/
public function toArray(Request $request): array {
- $tag_id = $this->tag_id;
+ // $tag_id = $this->tag_id;
- if (isset(self::$tagCache[$tag_id])) {
- $tag = self::$tagCache[$tag_id];
- } else {
- $tag = $this->tag;
- self::$tagCache[$tag_id] = $tag;
- }
+ // if (isset(self::$tagCache[$tag_id])) {
+ // $tag = self::$tagCache[$tag_id];
+ // } else {
+ // $tag = $this->tag;
+ // self::$tagCache[$tag_id] = $tag;
+ // }
return [
'video_tag_id' => $this->id,
- 'name' => $tag->name,
+ 'name' => $this->whenLoaded('tag', fn() => $this->tag->name),
'id' => $this->tag_id,
];
}