A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: metadata composable should be computed and each property should recompute on its own
aminnausind4a21095e403
diff --git a/resources/js/components/cards/VideoCard.vue b/resources/js/components/cards/VideoCard.vueindex a7de55a8..ed91f360 100755--- a/resources/js/components/cards/VideoCard.vue+++ b/resources/js/components/cards/VideoCard.vue@@ -4,7 +4,8 @@ import type { VideoResource } from '@/types/resources';import { formatFileSize, toFormattedDate } from '@/service/util';import { useContentStore } from '@/stores/ContentStore';-import { computed, watch } from 'vue';+import { computed, toRef } from 'vue';+import { useAuthStore } from '@/stores/AuthStore';import { storeToRefs } from 'pinia';import { useAppStore } from '@/stores/AppStore';import { RouterLink } from 'vue-router';@@ -18,16 +19,19 @@ import TablerMicrophone2 from '~icons/tabler/microphone-2';import ProiconsComment from '~icons/proicons/comment';import CircumShare1 from '~icons/circum/share-1';import CircumEdit from '~icons/circum/edit';-import { useAuthStore } from '@/stores/AuthStore';const emit = defineEmits(['clickAction', 'otherAction']);-const { data: videoData, index, currentID } = defineProps<{ data: VideoResource; index: number; currentID: any }>();-const metaData = useMetaData({ ...videoData }, true);+const { data: videoData, currentID } = defineProps<{ data: VideoResource; index: number; currentID: any }>();const { stateFolder, stateDirectory } = storeToRefs(useContentStore());const { setContextMenu } = useAppStore();const { userData } = storeToRefs(useAuthStore());+const { title, views, duration } = useMetaData(+ toRef(() => videoData),+ true,+);+const isAudio = computed(() => {return videoData.metadata?.media_type === MediaType.AUDIO;});@@ -52,14 +56,6 @@ const contextMenuItems = computed(() => {];return items;});--watch(- () => videoData,- () => {- metaData.updateData({ ...videoData });- },- { immediate: true, deep: true },-);</script><template>@@ -88,14 +84,14 @@ watch(<template #trigger><span class="flex group"><h3 class="line-clamp-1 break-all">- {{ metaData.fields.title }}+ {{ title }}</h3><ProiconsComment class="my-auto ms-4 group-hover:opacity-20 opacity-100 transition-opacity duration-300 shrink-0 h-5 w-5" title="Description" /></span></template></HoverCard><h3 v-else class="line-clamp-1 break-all" :title="videoData.title">- {{ metaData.fields.title }}+ {{ title }}</h3><HoverCardclass="items-end flex-1 -ms-2 hidden sm:block"@@ -129,13 +125,13 @@ watch(<section class="flex flex-wrap justify-between gap-x-4 gap-y-2 w-full items-start text-sm sm:w-auto text-neutral-600 dark:text-neutral-400 group"><span class="flex gap-2 items-center w-full flex-1"><span class="flex gap-1">- <h4 class="min-w-fit" :title="`View Count: ${metaData?.fields?.views}`">- {{ metaData?.fields?.views }}+ <h4 class="min-w-fit" :title="`View Count: ${views}`">+ {{ views }}</h4><h4>|</h4><h4 class="text-ellipsis text-wrap line-clamp-1" title="Duration">- {{ metaData?.fields?.duration }}+ {{ duration }}</h4></span>diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vueindex 580f1a57..2d8cb18e 100755--- a/resources/js/components/video/VideoInfoPanel.vue+++ b/resources/js/components/video/VideoInfoPanel.vue@@ -40,7 +40,7 @@ const { stateVideo, stateFolder } = storeToRefs(useContentStore()) as unknown asstateFolder: Ref<FolderResource>;};-const description = useTemplateRef('description');+const descriptionRef = useTemplateRef('description');const popover = useTemplateRef('popover');const route = useRoute();@@ -48,7 +48,8 @@ const personalViewCount = ref(-1);const isOverflowing = ref(false);const isExpanded = ref(false);-const metaData = useMetaData(stateVideo.value);+const { title, description: parsedDescription, views } = useMetaData(stateVideo);+const editFolderModal = useModal({ title: 'Edit Folder Metadata', submitText: 'Submit Metadata' });const editVideoModal = useModal({ title: 'Edit Metadata', submitText: 'Submit Metadata' });const shareVideoModal = useModal({ title: 'Share Video' });@@ -72,15 +73,13 @@ function handleSeek(seconds: number) {}function checkOverflow() {- if (!description.value) return;- isOverflowing.value = description.value.scrollHeight > description.value.clientHeight;+ if (!descriptionRef.value) return;+ isOverflowing.value = descriptionRef.value.scrollHeight > descriptionRef.value.clientHeight;}watch(() => stateVideo.value,async (current, prev) => {- metaData.updateData(stateVideo.value);-if (current.id !== prev?.id) {isExpanded.value = false;}@@ -116,7 +115,7 @@ onMounted(() => {<template><section class="flex flex-wrap gap-4 p-3 w-full rounded-xl shadow-lg dark:bg-primary-dark-800/70 bg-primary-800 z-[3] text-neutral-600 dark:text-neutral-400"><section id="mp4-header-mobile" class="flex items-center w-full sm:hidden flex-wrap gap-x-2 gap-1">- <HoverCard :content="metaData?.fields.title ?? '[File Not Found]'" class="flex-1 min-w-10">+ <HoverCard :content="title ?? '[File Not Found]'" class="flex-1 min-w-10"><template #trigger><h2:class="[@@ -124,7 +123,7 @@ onMounted(() => {{ 'bg-neutral-300 dark:bg-neutral-700 rounded-full w-full h-5 my-auto animate-pulse': !stateVideo.id },]">- {{ !stateVideo.id ? '' : (metaData?.fields.title ?? '[File Not Found]') }}+ {{ !stateVideo.id ? '' : (title ?? '[File Not Found]') }}</h2></template></HoverCard>@@ -163,7 +162,7 @@ onMounted(() => {<!-- {{[stateVideo.date_uploaded ? toTimeSpan(stateVideo.date_uploaded, '') : false,- metaData?.fields.views,+ metaData.views,stateVideo?.metadata?.resolution_height ? stateVideo?.metadata?.resolution_height + 'p' : false,].filter((value) => value)@@ -175,7 +174,7 @@ onMounted(() => {:colour="'bg-neutral-800 opacity-70 hover:opacity-100 transition-opacity leading-none shadow dark:bg-neutral-900 text-neutral-50 hover:dark:bg-neutral-600/90 !max-h-[22px] text-xs flex items-center'"><template #content>- {{ metaData?.fields.views }}+ {{ views }}<HoverCard :content="`You have viewed this ${personalViewCount} time${personalViewCount == 1 ? '' : 's'}`"><template #trigger><ProiconsEye@@ -241,9 +240,9 @@ onMounted(() => {{ 'bg-neutral-300 dark:bg-neutral-700 rounded-full h-5 my-auto animate-pulse': !stateVideo.id },{ 'h-8': stateVideo.id },]"- :title="metaData?.fields.title ?? 'no file was found at this location'"+ :title="title ?? 'no file was found at this location'">- {{ !stateVideo.id ? '' : (metaData?.fields.title ?? '[File Not Found]') }}+ {{ !stateVideo.id ? '' : (title ?? '[File Not Found]') }}</h2><section class="flex gap-2 justify-end h-8 lg:min-w-32 w-fit"><ButtonText v-if="userData" aria-label="edit details" title="Edit Metadata" @click="editVideoModal.toggleModal()" class="text-sm">@@ -269,8 +268,8 @@ onMounted(() => {]"ref="description">- <template v-if="stateVideo.description && metaData.fields.description">- <span v-for="(segment, i) in metaData.fields.description" :key="i">+ <template v-if="stateVideo.description && parsedDescription">+ <span v-for="(segment, i) in parsedDescription" :key="i"><template v-if="segment.type === 'timestamp' && segment.seconds !== undefined"><a:href="`?video=${stateVideo.id}&t=${segment.seconds}`"@@ -302,7 +301,7 @@ onMounted(() => {</button><span class="flex gap-2 items-end justify-between text-sm w-full flex-1"><span class="hidden sm:flex items-center justify-start gap-1 truncate h-[22px]">- <p class="lowercase">{{ metaData?.fields.views }}</p>+ <p class="lowercase">{{ views }}</p><HoverCard :content="`You have viewed this ${personalViewCount} time${personalViewCount == 1 ? '' : 's'}`"><template #trigger>@@ -354,9 +353,9 @@ onMounted(() => {<ModalBase :modalData="editVideoModal" :useControls="false"><template #description v-if="stateVideo.metadata?.editor_id && stateVideo.metadata.updated_at">Last edited by- <a title="Editor profile" target="_blank" :href="`/profile/${stateVideo.metadata.editor_id}`" class="hover:text-purple-600 dark:hover:text-purple-500"- >@{{ stateVideo.metadata.editor_id }}</a- >+ <a title="Editor profile" target="_blank" :href="`/profile/${stateVideo.metadata.editor_id}`" class="hover:text-purple-600 dark:hover:text-purple-500">+ @{{ stateVideo.metadata.editor_id }}+ </a>at{{ toFormattedDate(new Date(stateVideo.metadata.updated_at)) }}</template>diff --git a/resources/js/composables/useMetaData.ts b/resources/js/composables/useMetaData.tsindex a56b9e33..6ee989a0 100644--- a/resources/js/composables/useMetaData.ts+++ b/resources/js/composables/useMetaData.ts@@ -1,36 +1,22 @@import type { VideoResource } from '@/types/resources';+import type { Ref } from 'vue';import { formatFileSize, toFormattedDuration } from '@/service/util';import { MediaType } from '@/types/types';import { useRoute } from 'vue-router';-import { reactive } from 'vue';+import { computed, reactive } from 'vue';// This so does not work lol-export default function useMetaData(data: VideoResource, skipBaseURL: boolean = false) {+export default function useMetaData(data: Ref<VideoResource>, skipBaseURL: boolean = false) {const route = useRoute();- const metadata = reactive({- fields: {- title: `${generateEpisodeTag(data)}${data?.title ?? data?.name}`,- duration: toFormattedDuration(data?.duration) ?? 'N/A',- views: generateViewsTag(data?.view_count),- description: generateDescription(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: `${generateEpisodeTag(props)}${props?.title ?? props?.name}`,- duration: toFormattedDuration(props?.duration) ?? 'N/A',- views: generateViewsTag(props?.view_count),- description: generateDescription(props?.description ?? ''),- url: encodeURI((skipBaseURL ? '' : document.location.origin) + route.path + `?video=${data.id}`),- file_size: data.file_size ? formatFileSize(data.file_size) : '',- };- },- });+ const title = computed(() => `${generateEpisodeTag(data.value)}${data.value.title ?? data.value.name}`);+ const duration = computed(() => toFormattedDuration(data.value.duration) ?? 'N/A');+ const views = computed(() => generateViewsTag(data.value.view_count));+ const description = computed(() => generateDescription(data.value.description ?? ''));+ const url = computed(() => encodeURI((skipBaseURL ? '' : document.location.origin) + route.path + `?video=${data.value.id}`));+ const fileSize = computed(() => (data.value.file_size ? formatFileSize(data.value.file_size) : ''));function generateEpisodeTag(episodeData: VideoResource) {return episodeData.episode && episodeData.metadata?.media_type === MediaType.AUDIO ? `${episodeData.episode}. ` : '';@@ -71,5 +57,12 @@ export default function useMetaData(data: VideoResource, skipBaseURL: boolean =return parts;}- return metadata;+ return {+ title,+ duration,+ views,+ description,+ url,+ fileSize,+ };}