A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
optimise categories and records with eager loading
aminnausin0b301a78f0cd
diff --git a/app/Events/LibraryUpdated.php b/app/Events/LibraryUpdated.phpindex 1236d843..71b9cf8d 100644--- a/app/Events/LibraryUpdated.php+++ b/app/Events/LibraryUpdated.php@@ -42,6 +42,6 @@ class LibraryUpdated implements ShouldBroadcast {* Get the data to broadcast.*/public function broadcastWith(): array {- return ['library' => new CategoryResource($this->library)];+ return ['library' => new CategoryResource($this->library->withCount('folders'))];}}diff --git a/app/Http/Controllers/Api/V1/CategoryController.php b/app/Http/Controllers/Api/V1/CategoryController.phpindex 70d44a57..0d4dc36e 100755--- a/app/Http/Controllers/Api/V1/CategoryController.php+++ b/app/Http/Controllers/Api/V1/CategoryController.php@@ -21,7 +21,7 @@ class CategoryController extends Controller {abort(403, 'Unauthorized action.');}try {- $categories = Category::withCount('videos')->orderBy('name');+ $categories = Category::orderBy('name');if (Auth::user()->id !== 1) {$categories->where('is_private', false);@@ -29,7 +29,7 @@ class CategoryController extends Controller {return $this->success(CategoryResource::collection(- $categories->with(['folders.series'])->get()+ $categories->withCount(['folders', 'videos'])->with(['folders.series'])->get()));} catch (\Throwable $th) {@@ -46,7 +46,7 @@ class CategoryController extends Controller {*/public function show(Category $category) {$category->load(['folders.series']);- return new CategoryResource($category);+ return new CategoryResource($category->withCount(['folders', 'videos']));}/**diff --git a/app/Http/Controllers/Api/V1/RecordController.php b/app/Http/Controllers/Api/V1/RecordController.phpindex c54759f0..312dde41 100644--- a/app/Http/Controllers/Api/V1/RecordController.php+++ b/app/Http/Controllers/Api/V1/RecordController.php@@ -18,19 +18,17 @@ class RecordController extends Controller {* Display a listing of the resource.*/public function index(Request $request) {+ $records = Record::where('user_id', Auth::id())->with('metadata.video.folder.category')->latest();+if (isset($request->limit) && is_numeric($request->limit)) {- return $this->success(- RecordResource::collection(- Record::where('user_id', Auth::id())->latest()->limit($request->limit)->get()- )- );- } else {- return $this->success(- RecordResource::collection(- Record::where('user_id', Auth::id())->latest()->get()- )- );+ $records->limit($request->limit);}++ return $this->success(+ RecordResource::collection(+ $records->get()+ )+ );}/**diff --git a/app/Http/Resources/CategoryResource.php b/app/Http/Resources/CategoryResource.phpindex 0c40e77b..133ffa21 100755--- a/app/Http/Resources/CategoryResource.php+++ b/app/Http/Resources/CategoryResource.php@@ -4,7 +4,6 @@ namespace App\Http\Resources;use Illuminate\Http\Request;use Illuminate\Http\Resources\Json\JsonResource;-use Illuminate\Support\Facades\DB;class CategoryResource extends JsonResource {/**@@ -19,9 +18,7 @@ class CategoryResource extends JsonResource {'default_folder_id' => $this->default_folder_id,'folders_count' => $this->folders_count ?? 0,'folders' => FolderResource::collection($this->folders),- 'videos_count' => $this->videos_count ?? $this->when(true, function () {- return DB::table('videos')->join('folders', 'videos.folder_id', '=', 'folders.id')->join('categories', 'folders.category_id', '=', 'categories.id')->where('categories.id', $this->id)->count('videos.id');- }),+ 'videos_count' => $this->videos_count ?? 0,'created_at' => $this->created_at,'last_scan' => $this->last_scan,];diff --git a/app/Http/Resources/RecordResource.php b/app/Http/Resources/RecordResource.phpindex 9fbd5466..9e00f50d 100755--- a/app/Http/Resources/RecordResource.php+++ b/app/Http/Resources/RecordResource.php@@ -6,62 +6,18 @@ use Illuminate\Http\Request;use Illuminate\Http\Resources\Json\JsonResource;class RecordResource extends JsonResource {- // Mega Yikes AI code- protected static $categoryCache = [];-- protected static $folderCache = [];-- protected static $metadataCache = [];-- protected static $videoCache = [];-/*** Transform the resource into an array.** @return array<string, mixed>*/public function toArray(Request $request): array {- $metadata = null;- $video = null;- $folder = null;- $category = null;-- $metadataId = $this->metadata_id;-- if (isset(self::$metadataCache[$metadataId])) {- $metadata = self::$metadataCache[$metadataId];- } else {- $metadata = $this->metadata;- self::$metadataCache[$metadataId] = $metadata;- }- $videoId = $metadata?->video_id ?? $this?->video_id;- if (isset(self::$videoCache[$videoId])) {- $video = self::$videoCache[$videoId];- } else {- $video = $metadata?->video_id ? $metadata?->video : $this->video;- self::$videoCache[$videoId] = $video;- }-- $folderId = $video?->folder_id;-- if ($folderId) {- if (isset(self::$folderCache[$folderId])) {- $folder = self::$folderCache[$folderId];- } else {- $folder = $video->folder;- self::$folderCache[$folderId] = $folder;- }-- $categoryId = $folder->category_id;- if (isset(self::$categoryCache[$categoryId])) {- $category = self::$categoryCache[$categoryId];- } else {- $category = $folder->category;- self::$categoryCache[$categoryId] = $category;- }- }+ $metadata = $this->metadata;+ $video = $metadata?->video;+ $folder = $video?->folder;+ $category = $folder?->category;return ['id' => (string) $this->id,@@ -73,27 +29,10 @@ class RecordResource extends JsonResource {'folder' => $folder ?? ['name' => 'Unknown'],'metadata' => $metadata,'category' => $category,- 'video_id' => $videoId,- 'video_name' => $metadata->title ?? $this->name ?? 'Deleted',+ 'video_id' => $this->video_id ?? $metadata->video_id ?? null,+ 'video_name' => $metadata->title ?? $video->name ?? $this->name ?? 'Deleted','file_name' => $this->name,],];}}--// 'user' => $this->user,-// 'video' => $video,-// 'metadata' => $metadata ? new MetadataResource($metadata) : null,-// 'category' => $category ? new CategoryResource($category) : null,--// 'user' => $this->user,-// 'video' => $this->video,-// 'user_id' => (string)$this->user->id,-// 'user_name' => $this->user->name,-// 'video_id' => $this->video ? (string)$this->video->id : ($this->metadata && $this->metadata->video ? $this->metadata->video->id : null),-// 'video_name' => $this->metadata ? $this->metadata->title : ($this->video ? ($this->video->title ?? $this->video->name) : $this->name) ?? 'Deleted',-// 'file_name' => $this->video ? $this->video->name : $this->name,-// 'folder' => $this->video ? new FolderResource($this->video->folder) : array("name" => ($this->metadata && $this->metadata->video ? $this->metadata->video->folder->name : 'Unknown')),-// 'category' => $this->video && $this->video->folder->category ? new CategoryResource($this->video->folder->category) : null,-// 'metadata_id' => $this->metadata ? $this->metadata->id : 'None',-// 'metadata' => $this->metadata ? new MetadataResource($this->metadata) : null,diff --git a/app/Models/Category.php b/app/Models/Category.phpindex 210ad61e..8ba70364 100755--- a/app/Models/Category.php+++ b/app/Models/Category.php@@ -29,8 +29,8 @@ class Category extends Model {protected static function boot() {parent::boot(); // Automatic withCount- static::addGlobalScope('foldersCount', function ($builder) {- $builder->withCount('folders');- });+ // static::addGlobalScope('foldersCount', function ($builder) {+ // $builder->withCount('folders');+ // });}}diff --git a/app/Models/Metadata.php b/app/Models/Metadata.phpindex 6b88f787..215fb5c3 100644--- a/app/Models/Metadata.php+++ b/app/Models/Metadata.php@@ -56,6 +56,10 @@ class Metadata extends Model {return $this->hasMany(VideoTag::class);}+ public function records(): HasMany {+ return $this->hasMany(Record::class);+ }+public function getDateReleasedFormattedAttribute() {return $this->attributes['date_released'] ? Carbon::parse($this->attributes['date_released'])->format('F d, Y') : null;}diff --git a/app/Models/Record.php b/app/Models/Record.phpindex 49c86623..03ea37b6 100755--- a/app/Models/Record.php+++ b/app/Models/Record.php@@ -19,10 +19,6 @@ class Record extends Model {return $this->belongsTo(User::class);}- public function video() {- return $this->belongsTo(Video::class);- }-public function metadata() {return $this->belongsTo(Metadata::class);}