A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: Unnecessary Payload Fixes #291 and massively reduce record api compute and bandwidth usage
aminnausincb31deb5fcaf
diff --git a/app/Http/Controllers/Api/V1/RecordController.php b/app/Http/Controllers/Api/V1/RecordController.phpindex 7f7483d3..e3134146 100644--- a/app/Http/Controllers/Api/V1/RecordController.php+++ b/app/Http/Controllers/Api/V1/RecordController.php@@ -7,7 +7,6 @@ use App\Http\Requests\RecordStoreRequest;use App\Http\Resources\RecordResource;use App\Models\Metadata;use App\Models\Record;-use App\Models\Video;use App\Traits\HttpResponses;use Illuminate\Http\Request;use Illuminate\Support\Facades\Auth;@@ -40,23 +39,24 @@ class RecordController extends Controller {*/public function store(RecordStoreRequest $request) {$validated = $request->validated();- $video = Video::with(['metadata:id,video_id,title'])- ->where('id', $validated['video_id'])++ $metadata = Metadata::with(['video'])+ ->where('video_id', $validated['video_id'])->first();- if (! $video) {+ if (! $metadata) {return $this->error(null, 'Video does not exist', 404);}$record = Record::create(['user_id' => Auth::id(),- 'metadata_id' => $video->metadata?->id,- 'name' => $video->metadata ? $video->metadata->title : $video->name, // should be like meta data id in a persistent table that doesnt delete that has name episode season if available and displays depending on what data exists+ 'metadata_id' => $metadata?->id,+ 'name' => $metadata?->title ?? $metadata->video?->name, // should be like meta data id in a persistent table that doesnt delete that has name episode season if available and displays depending on what data exists]);- $record->load('metadata.video.folder.category');+ $record->setRelation('metadata', $metadata);- return $this->success(new RecordResource($record));+ return response()->json(new RecordResource($record));}/**diff --git a/app/Http/Resources/RecordResource.php b/app/Http/Resources/RecordResource.phpindex 6bbe788c..72594584 100755--- a/app/Http/Resources/RecordResource.php+++ b/app/Http/Resources/RecordResource.php@@ -21,12 +21,14 @@ class RecordResource extends JsonResource {'id' => $this->id,'created_at' => $this->created_at,'updated_at' => $this->updated_at,- 'metadata' => $metadata,- 'category' => $category,+ 'metadata' => $metadata ? [+ 'id' => $metadata->id,+ ] : null,+ 'category' => $category ? ['name' => $category->name] : null,'video_id' => $metadata?->video_id,'video_name' => $metadata?->title ?? $video?->name,'folder_name' => $folder?->name ?? 'Unknown',- 'file_name' => $this->name ?? null,+ 'file_name' => $this->name,];}}diff --git a/resources/js/components/cards/data/RecordCard.vue b/resources/js/components/cards/data/RecordCard.vueindex 4e726c40..8ea5d046 100644--- a/resources/js/components/cards/data/RecordCard.vue+++ b/resources/js/components/cards/data/RecordCard.vue@@ -1,5 +1,5 @@<script setup lang="ts">-import { type RecordResource } from '@/types/resources';+import type { RecordResource } from '@/types/resources';import { toFormattedDate, toTimeSpan } from '@/service/util';import { computed, ref, watch } from 'vue';@@ -18,8 +18,8 @@ const props = defineProps<{const rawDate = new Date((props.record.created_at ?? '').replace(' ', 'T'));const timeSpan = ref(toTimeSpan(rawDate));const videoLink = computed(() => {- if (!(props.record.video_id ?? props.record.metadata?.video_id) || !props.record.category?.name || !props.record.folder_name) return undefined;- return `/${encodeURIComponent(props.record?.category?.name ?? '')}/${encodeURIComponent(props.record.folder_name ?? '')}?video=${props.record.video_id ?? props.record.metadata?.video_id}`;+ if (!props.record.video_id || !props.record.category?.name || !props.record.folder_name) return undefined;+ return `/${encodeURIComponent(props.record.category.name)}/${encodeURIComponent(props.record.folder_name)}?video=${props.record.video_id}`;});watch(diff --git a/resources/js/components/cards/data/RecordCardDetails.vue b/resources/js/components/cards/data/RecordCardDetails.vueindex 68663613..18c99313 100644--- a/resources/js/components/cards/data/RecordCardDetails.vue+++ b/resources/js/components/cards/data/RecordCardDetails.vue@@ -17,7 +17,7 @@ const timeSpan = toTimeSpan(rawDate);const videoLink = computed(() => {if (!props.data.video_id || !props.data.category?.name || !props.data.folder_name) return false;- return `/${encodeURIComponent(props.data?.category?.name ?? '')}/${encodeURIComponent(props.data.folder_name ?? '')}?video=${props.data.video_id}`;+ return `/${encodeURIComponent(props.data.category.name)}/${encodeURIComponent(props.data.folder_name)}?video=${props.data.video_id}`;});</script>diff --git a/resources/js/contracts/playback.ts b/resources/js/contracts/playback.tsindex 56858e87..b04bc1f1 100644--- a/resources/js/contracts/playback.ts+++ b/resources/js/contracts/playback.ts@@ -1,5 +1,3 @@-import type { Category, Metadata } from '@/types/model';-export interface PlaybackResource {id: number;attributes: {@@ -11,8 +9,8 @@ export interface PlaybackResource {}export interface RecordResource {id: number;- metadata?: Metadata;- category?: Category;+ metadata?: { id: number };+ category?: { name: string };video_id?: number; // from metadata so eventually removefile_name?: string;video_name?: string;diff --git a/resources/js/service/records/api.ts b/resources/js/service/records/api.tsindex bf4bbf94..0a218025 100644--- a/resources/js/service/records/api.ts+++ b/resources/js/service/records/api.ts@@ -11,7 +11,7 @@ import { API } from '../api';export default {createRecord(data: RecordStoreRequest) {- return API.post<{ data: RecordResource }>('/records', data);+ return API.post<RecordResource>('/records', data);},getRecords(params?: { limit?: number; page?: number }) {const queryParams = new URLSearchParams();diff --git a/resources/js/service/records/useRecords.ts b/resources/js/service/records/useRecords.tsindex 9961d07c..76cfabac 100644--- a/resources/js/service/records/useRecords.ts+++ b/resources/js/service/records/useRecords.ts@@ -61,7 +61,7 @@ export function useRecord() {onSuccess: (res) => {if (!res) return;- const newRecord = res.data.data;+ const newRecord = res.data;// dont prepend to full history if not loaded yet to prevent query blockingqueryClient.setQueryData<RecordResource[]>(['records', 'full'], (old) => (old ? [newRecord, ...old] : old));