Skip to content

A self-hosted media server and file management system

fix: folder tags are not correctly eager loaded when opening a library or getting initial folders

aminnausin2422fe3c958f
diff --git a/app/Http/Controllers/Api/V1/CategoryController.php b/app/Http/Controllers/Api/V1/CategoryController.php
index 5e4084da..39c93025 100755
--- a/app/Http/Controllers/Api/V1/CategoryController.php
+++ b/app/Http/Controllers/Api/V1/CategoryController.php
@@ -31,7 +31,7 @@ class CategoryController extends Controller {
return $this->success([]);
}
- $categories = $categories->with(['folders.series.folderTags']);
+ $categories = $categories->with(['folders.series.folderTags.tag']);
return $this->success(
$userId
diff --git a/app/Http/Controllers/Api/V1/FolderController.php b/app/Http/Controllers/Api/V1/FolderController.php
index 0bf6a7d6..7e505329 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(['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
+ Folder::with(['series.folderTags.tag'])->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.videoTags.tag', 'series']);
+ $folder->load(['videos.metadata.videoTags.tag', 'series.folderTags.tag']);
return new FolderResource($folder);
}
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.php
index 20b3cb08..b613a5b4 100755
--- a/app/Http/Controllers/DirectoryController.php
+++ b/app/Http/Controllers/DirectoryController.php
@@ -38,10 +38,13 @@ class DirectoryController extends Controller {
$data = $this->buildBaseResponse($category, $folderIdentifier); // Default null values
+ // eager loads folders.series.foldertags.tag
$folderList = $this->loadCategoryFolders($category->id);
$data['dir']['folders'] = FolderResource::collection($folderList); // Full category data as http resources
+ // eager loads folder.series if not sending a list of folders (does not apply in this case)
$folder = $resolver->resolveFolder($folderIdentifier, $category, $folderList); // Load folder
+ // eager loads folder.videos.metadata.videotags.tag and folder.series.foldertags.tag for a single folder
$data = $this->loadFolderData($data, new FolderResource($folder));
$result = $this->success($data, '', 200);
@@ -86,7 +89,7 @@ class DirectoryController extends Controller {
}
private function loadCategoryFolders(int $categoryId): Collection {
- return Folder::with('series')
+ return Folder::with('series.folderTags.tag')
->where('category_id', $categoryId)
->orderBy('name')
->get();
diff --git a/app/Http/Resources/FolderResource.php b/app/Http/Resources/FolderResource.php
index 7364d78a..edea2bab 100755
--- a/app/Http/Resources/FolderResource.php
+++ b/app/Http/Resources/FolderResource.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Resources\Json\JsonResource;
class FolderResource extends JsonResource {
/**
* Transform the resource into an array.
+ * Ideally eager load series.folderTags.tag and (if required) video.metadata.videoTags.tag
*
* @return array<string, mixed>
*/