Skip to content

A self-hosted media server and file management system

fix: image loading optimisation across api

aminnausind70c1c30d40b
diff --git a/app/Http/Controllers/Api/V1/CategoryController.php b/app/Http/Controllers/Api/V1/CategoryController.php
index fd5e739b..6a996919 100755
--- a/app/Http/Controllers/Api/V1/CategoryController.php
+++ b/app/Http/Controllers/Api/V1/CategoryController.php
@@ -23,7 +23,7 @@ class CategoryController extends Controller {
$categories = Category::orderBy('name');
$userId = Auth::id();
- if ($userId !== 1) {
+ if (! $this->authorize('admin')) {
$categories->where('is_private', false);
}
@@ -31,7 +31,7 @@ class CategoryController extends Controller {
return $this->success([]);
}
- $categories = $categories->with(['folders.series.folderTags.tag', 'folders.series.primaryPoster']);
+ $categories = $categories->with(['folders.series', 'folders.series.primaryPoster']);
return $this->success(
$userId
diff --git a/app/Http/Controllers/Api/V1/FolderController.php b/app/Http/Controllers/Api/V1/FolderController.php
index b5ef7787..228bc63e 100755
--- a/app/Http/Controllers/Api/V1/FolderController.php
+++ b/app/Http/Controllers/Api/V1/FolderController.php
@@ -8,6 +8,7 @@ use App\Http\Resources\FolderResource;
use App\Models\Category;
use App\Models\Folder;
use App\Models\Subtitle;
+use App\Services\Auth\GuestIdentity;
use App\Traits\HttpResponses;
use Illuminate\Support\Facades\Auth;
@@ -30,7 +31,7 @@ class FolderController extends Controller {
try {
return $this->success(
FolderResource::collection(
- 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
+ Folder::with(['series.folderTags.tag', 'series.primaryPoster', 'series.images.user'])->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) {
@@ -42,13 +43,22 @@ class FolderController extends Controller {
* Display the specified resource.
* Get Folder with video count from folder ID
*
- * @param int $video_id
* @return \Illuminate\Http\Response
*/
public function show(Folder $folder) {
- $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());
- }]);
+ $folder->load([
+ 'videos.metadata.videoTags.tag',
+ 'series.folderTags.tag',
+ 'series.primaryPoster',
+ 'series.images.user',
+ 'videos.metadata.storyboard',
+ 'videos.metadata.primaryPoster',
+ 'videos.metadata.images.user',
+ 'videos.metadata.playbackProgress' => fn ($q) => GuestIdentity::scope($q)->limit(1),
+ '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.php
index 73a677fe..ee21c53c 100755
--- a/app/Http/Controllers/Api/V1/VideoController.php
+++ b/app/Http/Controllers/Api/V1/VideoController.php
@@ -6,7 +6,6 @@ use App\Http\Controllers\Controller;
use App\Http\Requests\VideoCollectionRequest;
use App\Http\Resources\VideoResource;
use App\Models\Record;
-use App\Models\Subtitle;
use App\Models\Video;
use App\Traits\HttpResponses;
use Illuminate\Http\Request;
@@ -25,6 +24,7 @@ class VideoController extends Controller {
'metadata.subtitles',
'metadata.videoTags',
'metadata.primaryPoster',
+ 'metadata.images',
])->where('folder_id', $request->folder_id)->get());
return $this->success($result);
@@ -36,10 +36,9 @@ class VideoController extends Controller {
/**
* Update view counter
*
- * @param int $id
* @return \Illuminate\Http\Response
*/
- public function watch(Request $request, Video $video) {
+ public function watch(Request $_, Video $video) {
$metadata = $video->metadata;
// Only update view count via metadata if it exists (ie do not reset)
@@ -50,12 +49,6 @@ 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',
- 'metadata.primaryPoster',
- 'metadata.subtitles' => function ($q) {
- $q->select(Subtitle::getVisibleFields());
- },
- ])));
+ return response()->noContent();
}
}
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.php
index 1c38b6ba..99b7a4ab 100755
--- a/app/Http/Controllers/DirectoryController.php
+++ b/app/Http/Controllers/DirectoryController.php
@@ -93,7 +93,11 @@ class DirectoryController extends Controller {
}
private function loadCategoryFolders(int $categoryId): Collection {
- return Folder::with('series.folderTags.tag', 'series.primaryPoster')
+ return Folder::with([
+ 'series.folderTags.tag',
+ 'series.primaryPoster',
+ 'series.images.user',
+ ])
->where('category_id', $categoryId)
->orderBy('name')
->get();
@@ -104,6 +108,7 @@ class DirectoryController extends Controller {
'videos.metadata.videoTags.tag',
'videos.metadata.storyboard',
'videos.metadata.primaryPoster',
+ 'videos.metadata.images.user',
'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.php
index 62fb82c9..52cbc0c2 100644
--- a/app/Http/Resources/ImageResource.php
+++ b/app/Http/Resources/ImageResource.php
@@ -5,8 +5,6 @@ namespace App\Http\Resources;
use App\Enums\ImageSource;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Gate;
class ImageResource extends JsonResource {
/**
@@ -21,7 +19,9 @@ class ImageResource extends JsonResource {
'type' => $this->image_type,
'source' => $this->user_id && $this->image_source === ImageSource::DOWNLOADED ? ImageSource::UPLOADED : $this->image_source,
'blur_hash' => $this->blur_hash,
- 'user_id' => $this->user_id === Auth::id() || Gate::allows('admin') ? $this->user_id : null,
+ 'user_id' => $this->user_id,
+ 'user' => $this->whenLoaded('user', fn () => $this->user ? new UserResource($this->user) : null),
+ 'created_at' => $this->created_at,
'replaced_at' => $this->replaced_at,
];
}
diff --git a/app/Http/Resources/MetadataResource.php b/app/Http/Resources/MetadataResource.php
index 298dcb73..d747c9fb 100644
--- a/app/Http/Resources/MetadataResource.php
+++ b/app/Http/Resources/MetadataResource.php
@@ -25,8 +25,8 @@ class MetadataResource extends JsonResource {
'lyrics' => $this->lyrics,
'poster_url' => $this->poster_url,
- 'poster_image' => $this->primaryPoster ? new ImageResource($this->primaryPoster) : null,
- 'images' => ImageResource::collection($this->images),
+ 'poster_image' => $this->whenLoaded('primaryPoster', fn () => $this->primaryPoster ? new ImageResource($this->primaryPoster) : null),
+ 'images' => $this->whenLoaded('images', fn () => ImageResource::collection($this->images), []),
'duration' => $this->duration,
'mime_type' => $this->mime_type,
diff --git a/app/Http/Resources/SeriesResource.php b/app/Http/Resources/SeriesResource.php
index d0669669..0ee6036c 100644
--- a/app/Http/Resources/SeriesResource.php
+++ b/app/Http/Resources/SeriesResource.php
@@ -25,7 +25,7 @@ class SeriesResource extends JsonResource {
'episodes' => $this->episodes,
'films' => $this->films,
'avg_intro_duration' => $this->avg_intro_duration,
- 'folder_tags' => FolderTagResource::collection($this->folderTags ?? []),
+ 'folder_tags' => $this->whenLoaded('folderTags', fn () => FolderTagResource::collection($this->folderTags), []),
'started_at' => $this->started_at,
'ended_at' => $this->ended_at,
'created_at' => $this->created_at,
@@ -33,9 +33,9 @@ class SeriesResource extends JsonResource {
'edited_at' => $this->edited_at,
'downloads_enabled' => $this->downloads_enabled,
- 'thumbnail_url' => $this->whenLoaded('images', count($this->images), 0) === 0 ? $this->thumbnail_url : null,
- 'poster_image' => $this->primaryPoster ? new ImageResource($this->primaryPoster) : null,
- 'images' => ImageResource::collection($this->whenLoaded('images', $this->images, [])),
+ 'thumbnail_url' => $this->primary_poster_id ? null : $this->thumbnail_url,
+ 'poster_image' => $this->whenLoaded('primaryPoster', fn () => $this->primaryPoster ? new ImageResource($this->primaryPoster) : null),
+ 'images' => $this->whenLoaded('images', fn () => ImageResource::collection($this->images), []),
];
}
}
diff --git a/app/Models/Image.php b/app/Models/Image.php
index b83fbce7..32f50f85 100644
--- a/app/Models/Image.php
+++ b/app/Models/Image.php
@@ -6,6 +6,7 @@ use App\Enums\ImageSource;
use App\Enums\ImageType;
use App\Enums\ImageVariant;
use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\MorphTo;
class Image extends Model {
@@ -65,6 +66,10 @@ class Image extends Model {
return $this->morphTo();
}
+ public function user(): BelongsTo {
+ return $this->belongsTo(User::class);
+ }
+
public function filename(): string {
$variant = $this->image_variant ? "_{$this->image_variant->value}" : '';
$ext = $this->format ?? 'webp';