Skip to content

A self-hosted media server and file management system

fix: libraries index get request queries all columns of all categories, folders and series

aminnausin57ab3a884cf3
diff --git a/app/Http/Controllers/Api/V1/CategoryController.php b/app/Http/Controllers/Api/V1/CategoryController.php
index aff2a246..3ee746a7 100755
--- a/app/Http/Controllers/Api/V1/CategoryController.php
+++ b/app/Http/Controllers/Api/V1/CategoryController.php
@@ -27,7 +27,17 @@ class CategoryController extends Controller {
$categories->where('is_private', false);
}
- $categories->with(['folders.series.primaryPoster']);
+ $categories->with([
+ 'folders' => function ($query) {
+ $query->select('id', 'category_id', 'name');
+ },
+ 'folders.series' => function ($query) {
+ $query->select('id', 'title', 'primary_poster_id', 'file_count', 'folder_id', 'total_size', 'episodes');
+ },
+ 'folders.series.primaryPoster' => function ($query) {
+ $query->select('id', 'path', 'imageable_id');
+ },
+ ]);
return response()->json(CategoryResource::collection($categories->get()));
}
diff --git a/app/Http/Resources/FolderResource.php b/app/Http/Resources/FolderResource.php
index 77a6056d..baf283a6 100755
--- a/app/Http/Resources/FolderResource.php
+++ b/app/Http/Resources/FolderResource.php
@@ -29,7 +29,7 @@ class FolderResource extends JsonResource {
'episodes' => $this->series?->episodes ?? 0,
'file_count' => $this->series?->file_count ?? 0,
'total_size' => $this->series?->total_size ?? 0,
- 'is_majority_audio' => $this->series->primary_media_type->value === MediaType::AUDIO->value,
+ 'is_majority_audio' => $this->series?->primary_media_type?->value === MediaType::AUDIO->value,
'category_id' => $this->category_id,
'series' => new SeriesResource($this->series),
'videos' => $this->when($request->videos, function () {
diff --git a/resources/js/service/mediaAPI.ts b/resources/js/service/mediaAPI.ts
index fcc89afb..972deafa 100644
--- a/resources/js/service/mediaAPI.ts
+++ b/resources/js/service/mediaAPI.ts
@@ -54,7 +54,7 @@ export function getCategories(): Promise<AxiosResponse<CategoryResource[]>> {
}
export function getFolders(category_id: number) {
- return API.get(`/folders/?category_id=${category_id}`);
+ return API.get(`/folders?category_id=${category_id}`);
}
export function getUserViewCount(id: number) {