A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
Fix loading the same metadata for all videos
aminnausind3a65d945847
diff --git a/app/Http/Controllers/Api/V1/FolderController.php b/app/Http/Controllers/Api/V1/FolderController.phpindex 9a064a49..97d7d0b6 100755--- a/app/Http/Controllers/Api/V1/FolderController.php+++ b/app/Http/Controllers/Api/V1/FolderController.php@@ -29,7 +29,7 @@ class FolderController extends Controller {try {return $this->success(FolderResource::collection(- Folder::where('category_id', $validated['category_id'])->orderBy('id')->get()+ Folder::with(['videos.metadata', 'series'])->where('category_id', $validated['category_id'])->orderBy('id')->get()));} catch (\Throwable $th) {@@ -45,6 +45,8 @@ class FolderController extends Controller {* @return \Illuminate\Http\Response*/public function show(Folder $folder) {+ $folder->load(['videos.metadata', 'series']);+return new FolderResource($folder);}}diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.phpindex 96309643..0be3656c 100755--- a/app/Http/Controllers/DirectoryController.php+++ b/app/Http/Controllers/DirectoryController.php@@ -57,7 +57,7 @@ class DirectoryController extends Controller {$data = ['dir' => ['id' => null, 'name' => $dir, 'folders' => null], 'folder' => ['id' => null, 'name' => $folderName ?? null, 'videos' => null]]; // Default null values- $folderList = Folder::where('category_id', $dirRaw->id)->withCount(['videos'])->orderBy('name'); // Folders in category+ $folderList = Folder::with('series')->where('category_id', $dirRaw->id)->withCount(['videos'])->orderBy('name'); // Folders in category$data['dir'] = ['id' => $dirRaw->id, 'name' => $dir, 'folders' => FolderResource::collection($folderList->get())]; // Full category data$folderRaw = isset($request->folderName)@@ -80,8 +80,12 @@ class DirectoryController extends Controller {return $this->error(['categoryName' => $dir, 'folderName' => $folderName], 'Cannot find folder in specified category', 404);}- $videoList = VideoResource::collection(Video::where('folder_id', $folderRaw->id)->get());- $data['folder'] = ['id' => $folderRaw->id, 'name' => $folderRaw->name, 'videos' => $videoList, 'series' => (isset($folderRaw->series) ? new SeriesResource($folderRaw->series) : null)];+ $folderRaw->load(['videos.metadata.videoTags']);++ $videoList = VideoResource::collection($folderRaw->videos); // VideoResource::collection(Video::where('folder_id', $folderRaw->id)->get());+ $data['folder'] = ['id' => $folderRaw->id, 'name' => $folderRaw->name, 'videos' => $videoList, 'series' => $data['dir']['folders']->first(function ($folder) use ($folderRaw) {+ return $folder->id === $folderRaw->id;+ })->series];return $this->success($data, '', 200);} catch (\Throwable $th) {diff --git a/app/Http/Resources/VideoResource.php b/app/Http/Resources/VideoResource.phpindex e0984174..e81a0dca 100755--- a/app/Http/Resources/VideoResource.php+++ b/app/Http/Resources/VideoResource.php@@ -6,26 +6,13 @@ use Illuminate\Http\Request;use Illuminate\Http\Resources\Json\JsonResource;class VideoResource extends JsonResource {- protected static $metadataCache = [];-- protected static $videoTagCache = [];-/*** Transform the resource into an array.** @return array<string, mixed>*/public function toArray(Request $request): array {- $metadata = null;-- $metadataId = $this->metadata_id;-- if (isset(self::$metadataCache[$metadataId])) {- $metadata = self::$metadataCache[$metadataId];- } else {- $metadata = $this->metadata;- self::$metadataCache[$metadataId] = $metadata;- }+ $metadata = $this->metadata;return ['id' => (string) $this->id,diff --git a/docker/.env.docker b/docker/.env.dockerindex e8159479..ae08ad53 100644--- a/docker/.env.docker+++ b/docker/.env.docker@@ -1,6 +1,7 @@APP_SCHEME=httpAPP_HOST=app.testAPP_PORT=8080+REVERB_PORT=8080DB_HOST=dbDB_PORT=5432diff --git a/resources/js/components/cards/VideoCard.vue b/resources/js/components/cards/VideoCard.vueindex df67e451..6ba37781 100755--- a/resources/js/components/cards/VideoCard.vue+++ b/resources/js/components/cards/VideoCard.vue@@ -19,7 +19,7 @@ import CircumEdit from '~icons/circum/edit';const emit = defineEmits(['clickAction', 'otherAction']);const props = defineProps<{ data: VideoResource; index: number; currentID: any }>();-const metaData = useMetaData({ ...props.data, id: props.data.id, skipBaseURL: true });+const metaData = useMetaData({ ...props.data }, true);const { stateFolder, stateDirectory } = storeToRefs(useContentStore());const { setContextMenu } = useAppStore();@@ -46,7 +46,7 @@ const contextMenuItems = computed(() => {watch(props,() => {- metaData.updateData({ ...props.data, skipBaseURL: true });+ metaData.updateData({ ...props.data });},{ immediate: true, deep: true },);diff --git a/resources/js/composables/useMetaData.js b/resources/js/composables/useMetaData.jsdeleted file mode 100755index 5d82a698..00000000--- a/resources/js/composables/useMetaData.js+++ /dev/null@@ -1,30 +0,0 @@-import { formatFileSize, toFormattedDuration } from '@/service/util';-import { useRoute } from 'vue-router';-import { reactive } from 'vue';--// This so does not work lol-export default function useMetaData(data) {- const route = useRoute();-- const metadata = reactive({- data,- fields: {- title: data?.title ?? data?.name,- duration: toFormattedDuration(data?.duration) ?? 'N/A',- views: data?.view_count ? `${data?.view_count} View${data?.view_count !== 1 ? 's' : ''}` : '0 Views',- description: data.description ?? '',- url: encodeURI(data?.skipBaseURL ? '' : document.location.origin + route.path + `?video=${data.id ?? ''}`),- file_size: data.file_size ? formatFileSize(data.file_size) : '',- },- updateData(props) {- this.fields.title = props?.title ?? props?.name;- this.fields.duration = toFormattedDuration(props?.duration) ?? 'N/A';- this.fields.views = props?.view_count ? `${props?.view_count} View${props?.view_count !== 1 ? 's' : ''}` : '0 Views';- this.fields.description = props?.description ?? '';- this.fields.url = encodeURI((props?.skipBaseURL ? '' : document.location.origin) + route.path + `?video=${data.id}`);- this.file_size = data.file_size ? formatFileSize(data.file_size) : '';- },- });-- return metadata;-}diff --git a/resources/js/composables/useMetaData.ts b/resources/js/composables/useMetaData.tsnew file mode 100644index 00000000..55ef4fab--- /dev/null+++ b/resources/js/composables/useMetaData.ts@@ -0,0 +1,34 @@+import type { VideoResource } from '@/types/resources';++import { formatFileSize, toFormattedDuration } from '@/service/util';+import { useRoute } from 'vue-router';+import { reactive } from 'vue';++// This so does not work lol+export default function useMetaData(data: VideoResource, skipBaseURL: boolean = false) {+ const route = useRoute();++ const metadata = reactive({+ fields: {+ title: data?.title ?? data?.name,+ duration: toFormattedDuration(data?.duration) ?? 'N/A',+ views: data?.view_count ? `${data?.view_count} View${data?.view_count !== 1 ? 's' : ''}` : '0 Views',+ description: data?.description ?? '',+ url: encodeURI((skipBaseURL ? '' : document.location.origin) + route.path + `?video=${data.id}`),+ file_size: data.file_size ? formatFileSize(data.file_size) : '',+ },+ updateData(props: VideoResource) {+ this.fields = {+ ...this.fields,+ title: props?.title ?? props?.name,+ duration: toFormattedDuration(props?.duration) ?? 'N/A',+ views: props?.view_count ? `${props?.view_count} View${props?.view_count !== 1 ? 's' : ''}` : '0 Views',+ description: props?.description ?? '',+ url: encodeURI((skipBaseURL ? '' : document.location.origin) + route.path + `?video=${data.id}`),+ file_size: data.file_size ? formatFileSize(data.file_size) : '',+ };+ },+ });++ return metadata;+}