A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: update api to eager load and send primary poster image
aminnausina3c7f53732bf
diff --git a/app/Http/Controllers/Api/V1/CategoryController.php b/app/Http/Controllers/Api/V1/CategoryController.phpindex 620c766d..fd5e739b 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.tag']);+ $categories = $categories->with(['folders.series.folderTags.tag', 'folders.series.primaryPoster']);return $this->success($userIddiff --git a/app/Http/Controllers/Api/V1/FolderController.php b/app/Http/Controllers/Api/V1/FolderController.phpindex 75b091c5..b5ef7787 100755--- a/app/Http/Controllers/Api/V1/FolderController.php+++ b/app/Http/Controllers/Api/V1/FolderController.php@@ -30,7 +30,7 @@ class FolderController extends Controller {try {return $this->success(FolderResource::collection(- 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+ Folder::with(['series.folderTags.tag', 'series.primaryPoster'])->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) {@@ -46,9 +46,9 @@ class FolderController extends Controller {* @return \Illuminate\Http\Response*/public function show(Folder $folder) {- $folder->load(['videos.metadata.videoTags.tag', 'series.folderTags.tag', 'videos.metadata.storyboard', 'videos.metadata.subtitles' => function ($q) {+ $folder->load(['videos.metadata.videoTags.tag', 'series.folderTags.tag', 'series.primaryPoster', 'videos.metadata.storyboard', 'videos.metadata.primaryPoster', 'videos.metadata.subtitles' => function ($q) {$q->select(Subtitle::getVisibleFields());- }, ]);+ }]);return new FolderResource($folder);}diff --git a/app/Http/Controllers/Api/V1/VideoController.php b/app/Http/Controllers/Api/V1/VideoController.phpindex 29969698..73a677fe 100755--- a/app/Http/Controllers/Api/V1/VideoController.php+++ b/app/Http/Controllers/Api/V1/VideoController.php@@ -20,7 +20,12 @@ class VideoController extends Controller {*/public function getFrom(VideoCollectionRequest $request) {try {- $result = VideoResource::collection(Video::with(['metadata', 'metadata.subtitles', 'metadata.videoTags'])->where('folder_id', $request->folder_id)->get());+ $result = VideoResource::collection(Video::with([+ 'metadata',+ 'metadata.subtitles',+ 'metadata.videoTags',+ 'metadata.primaryPoster',+ ])->where('folder_id', $request->folder_id)->get());return $this->success($result);} catch (\Throwable $th) {@@ -47,6 +52,7 @@ class VideoController extends Controller {return $this->success(new VideoResource($video->load(['metadata.videoTags.tag',+ 'metadata.primaryPoster','metadata.subtitles' => function ($q) {$q->select(Subtitle::getVisibleFields());},diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.phpindex c67f45a3..1c38b6ba 100755--- a/app/Http/Controllers/DirectoryController.php+++ b/app/Http/Controllers/DirectoryController.php@@ -19,7 +19,7 @@ use Illuminate\Support\Facades\Auth;class DirectoryController extends Controller {use HttpResponses;- protected $taskService;+ protected TaskService $taskService;protected $privateCategories = ['legacy' => 1];@@ -93,7 +93,7 @@ class DirectoryController extends Controller {}private function loadCategoryFolders(int $categoryId): Collection {- return Folder::with('series.folderTags.tag')+ return Folder::with('series.folderTags.tag', 'series.primaryPoster')->where('category_id', $categoryId)->orderBy('name')->get();@@ -103,6 +103,7 @@ class DirectoryController extends Controller {$folder->load(['videos.metadata.videoTags.tag','videos.metadata.storyboard',+ 'videos.metadata.primaryPoster','videos.metadata.playbackProgress' => fn ($q) => GuestIdentity::scope($q)->limit(1),'videos.metadata.subtitles' => function ($q) {$q->select(Subtitle::getVisibleFields());diff --git a/app/Http/Resources/ImageResource.php b/app/Http/Resources/ImageResource.phpnew file mode 100644index 00000000..5dd51de1--- /dev/null+++ b/app/Http/Resources/ImageResource.php@@ -0,0 +1,21 @@+<?php++namespace App\Http\Resources;++use Illuminate\Http\Request;+use Illuminate\Http\Resources\Json\JsonResource;++class ImageResource extends JsonResource {+ /**+ * Transform the resource into an array.+ *+ * @return array<string, mixed>+ */+ public function toArray(Request $request): array {+ return [+ 'id' => $this->id,+ 'path' => "/storage/{$this->path}",+ 'blur_hash' => $this->blur_hash,+ ];+ }+}diff --git a/app/Http/Resources/MetadataResource.php b/app/Http/Resources/MetadataResource.phpindex b513340e..8c394e6d 100644--- a/app/Http/Resources/MetadataResource.php+++ b/app/Http/Resources/MetadataResource.php@@ -25,6 +25,7 @@ class MetadataResource extends JsonResource {'lyrics' => $this->lyrics,'poster_url' => $this->poster_url,+ 'poster_image' => $this->primaryPoster ? new ImageResource($this->primaryPoster) : null,'duration' => $this->duration,'mime_type' => $this->mime_type,diff --git a/app/Http/Resources/SeriesResource.php b/app/Http/Resources/SeriesResource.phpindex 8329c413..aecaf222 100644--- a/app/Http/Resources/SeriesResource.php+++ b/app/Http/Resources/SeriesResource.php@@ -27,11 +27,13 @@ class SeriesResource extends JsonResource {'folder_tags' => FolderTagResource::collection($this->folderTags ?? []),'started_at' => $this->started_at,'ended_at' => $this->ended_at,- 'thumbnail_url' => $this->thumbnail_url,'created_at' => $this->created_at,'updated_at' => $this->updated_at,'edited_at' => $this->edited_at,'downloads_enabled' => $this->downloads_enabled,++ 'thumbnail_url' => $this->thumbnail_url,+ 'poster_image' => $this->primaryPoster ? new ImageResource($this->primaryPoster) : null,];}}