A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix missing tag names
aminnausind770a1c2d222
diff --git a/app/Http/Resources/CategoryResource.php b/app/Http/Resources/CategoryResource.phpindex dfe6153e..cea2da77 100755--- a/app/Http/Resources/CategoryResource.php+++ b/app/Http/Resources/CategoryResource.php@@ -12,7 +12,11 @@ class CategoryResource extends JsonResource {* @return array<string, mixed>*/public function toArray(Request $request): array {- $folders = $this->whenLoaded('folders');+ if (! $this->relationLoaded('folders')) {+ $this->loadMissing('folders');+ }++ $folders = $this->folders;$videosCount = $folders->sum(function ($folder) {return $folder->video_count ?? $folder->series->episodes;diff --git a/app/Http/Resources/VideoResource.php b/app/Http/Resources/VideoResource.phpindex b5c7cb46..c07e84e7 100755--- a/app/Http/Resources/VideoResource.php+++ b/app/Http/Resources/VideoResource.php@@ -30,10 +30,7 @@ class VideoResource extends JsonResource {'season' => $metadata?->season ?: $this->season,'view_count' => $metadata?->view_count ?: $this->view_count,'file_size' => $metadata?->file_size ?: null,- 'video_tags' => $this->whenLoaded(- 'metadata',- fn() => VideoTagResource::collection($metadata->videoTags)- ),+ 'video_tags' => VideoTagResource::collection($metadata->videoTags ?? []),'date_released' => $metadata?->date_released ?: null,'date_updated' => $metadata?->updated_at ?: null,'date_uploaded' => $metadata?->date_uploaded ?: null,diff --git a/app/Http/Resources/VideoTagResource.php b/app/Http/Resources/VideoTagResource.phpindex 8eeab970..21fe0fb5 100644--- a/app/Http/Resources/VideoTagResource.php+++ b/app/Http/Resources/VideoTagResource.php@@ -23,9 +23,15 @@ class VideoTagResource extends JsonResource {// self::$tagCache[$tag_id] = $tag;// }+ if (! $this->relationLoaded('tag')) {+ $this->loadMissing('tag');+ }++ $tag = $this->tag;+return ['video_tag_id' => $this->id,- 'name' => $this->whenLoaded('tag', fn () => $this->tag->name),+ 'name' => $tag->name,'id' => $this->tag_id,];}