A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix history recording
aminnausin52501a239fcb
diff --git a/app/Http/Controllers/Api/V1/VideoController.php b/app/Http/Controllers/Api/V1/VideoController.phpindex 66dcab13..9d36b2cc 100755--- a/app/Http/Controllers/Api/V1/VideoController.php+++ b/app/Http/Controllers/Api/V1/VideoController.php@@ -65,13 +65,13 @@ class VideoController extends Controller {* @return \Illuminate\Http\Response*/public function watch(Request $request, Video $video) {- $metadata = $video->metadata()->first();+ $metadata = $video->metadata();if ($metadata) {$metadata->update(['view_count' => ($metadata->view_count ?? 0) + 1]);} else {$video->update(['view_count' => ($video->view_count ?? 0) + 1]);}- return $this->success(new VideoResource($video));+ return $this->success(new VideoResource($video->load('metadata.videoTags.tag')));}}diff --git a/app/Http/Resources/VideoResource.php b/app/Http/Resources/VideoResource.phpindex 6669a131..eff38774 100755--- a/app/Http/Resources/VideoResource.php+++ b/app/Http/Resources/VideoResource.php@@ -12,14 +12,18 @@ class VideoResource extends JsonResource {* @return array<string, mixed>*/public function toArray(Request $request): array {- $metadata = $this->whenLoaded('metadata');+ if (!$this->relationLoaded('metadata')) {+ $this->loadMissing('metadata');+ }++ $metadata = $this->metadata;return ['id' => (string) $this->id,'name' => $this->name,'path' => $this->path,'date' => $this->date,- 'title' => $metadata?->title ?: $this->title ?: $this->name,+ 'title' => $metadata?->title ?: $this->name,'description' => $metadata?->description ?: $this->description, // ?: $this->folder->series->description'duration' => $metadata?->duration ?: $this->duration,'episode' => $metadata?->episode ?: $this->episode,@@ -28,7 +32,7 @@ class VideoResource extends JsonResource {'file_size' => $metadata?->file_size ?: null,'video_tags' => $this->whenLoaded('metadata',- fn () => VideoTagResource::collection($metadata->videoTags)+ fn() => VideoTagResource::collection($metadata->videoTags)),'date_released' => $metadata?->date_released ?: null,'date_updated' => $metadata?->updated_at ?: null,