A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
simplify metadata
aminnausin7fc879e8d5aa
diff --git a/resources/js/components/cards/VideoCard.vue b/resources/js/components/cards/VideoCard.vueindex 120adae7..df67e451 100755--- a/resources/js/components/cards/VideoCard.vue+++ b/resources/js/components/cards/VideoCard.vue@@ -23,10 +23,6 @@ const metaData = useMetaData({ ...props.data, id: props.data.id, skipBaseURL: trconst { stateFolder, stateDirectory } = storeToRefs(useContentStore());const { setContextMenu } = useAppStore();-const handlePropsUpdate = () => {- metaData.updateData({ ...props.data, id: props.data.id, skipBaseURL: true });-};-const contextMenuItems = computed(() => {let items: ContextMenuItem[] = [{@@ -47,7 +43,13 @@ const contextMenuItems = computed(() => {return items;});-watch(props, handlePropsUpdate, { immediate: true, deep: true });+watch(+ props,+ () => {+ metaData.updateData({ ...props.data, skipBaseURL: true });+ },+ { immediate: true, deep: true },+);</script><template>diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vueindex 9ea957aa..561ce242 100755--- a/resources/js/components/video/VideoInfoPanel.vue+++ b/resources/js/components/video/VideoInfoPanel.vue@@ -1,7 +1,7 @@<script setup lang="ts">import type { FolderResource, VideoResource } from '@/types/resources';-import { useTemplateRef, watch, type Ref } from 'vue';+import { computed, useTemplateRef, watch, type Ref } from 'vue';import { handleStorageURL } from '@/service/util';import { useContentStore } from '@/stores/ContentStore';import { useAuthStore } from '@/stores/AuthStore';@@ -23,6 +23,7 @@ import Popover from '@/components/pinesUI/Popover.vue';import ProiconsMoreVertical from '~icons/proicons/more-vertical';import CircumShare1 from '~icons/circum/share-1';import CircumEdit from '~icons/circum/edit';+import { useRoute } from 'vue-router';const { updateVideoData, updateFolderData } = useContentStore();const { userData } = storeToRefs(useAuthStore());@@ -32,6 +33,7 @@ const { stateVideo, stateFolder } = storeToRefs(useContentStore()) as unknown as};const popover = useTemplateRef('popover');+const route = useRoute();const defaultDescription = `After defeating theDemon Lord, Himmel the Hero, priest Heiter, dwarf warrior Eisen, and elf mage@@ -51,14 +53,14 @@ const defaultDescription = `After defeating thelife-extending magic and tutor Fern in magic in her spare time. She agrees afterseeing Fern is already remarkably skilled despite her youth.`;-const metaData = useMetaData({ ...stateVideo.value });+const metaData = useMetaData(stateVideo.value);const editFolderModal = useModal({ title: 'Edit Folder Details', submitText: 'Submit Details' });const editVideoModal = useModal({ title: 'Edit Video Details', submitText: 'Submit Details' });const shareVideoModal = useModal({ title: 'Share Video' });-const handlePropsUpdate = () => {- metaData.updateData({ ...stateVideo.value, id: stateVideo.value.id });-};+const videoURL = computed(() => {+ return document.location.origin + route.path + (stateVideo.value.id ? `?video=${stateVideo.value.id}` : '');+});const handleVideoDetailsUpdate = (res: any) => {updateVideoData(res?.data);@@ -70,7 +72,13 @@ const handleSeriesUpdate = (res: any) => {editFolderModal.toggleModal(false);};-watch(() => stateVideo.value, handlePropsUpdate, { immediate: true, deep: true });+watch(+ () => stateVideo.value,+ () => {+ metaData.updateData(stateVideo.value);+ },+ { immediate: true, deep: true },+);</script><template>@@ -205,7 +213,7 @@ watch(() => stateVideo.value, handlePropsUpdate, { immediate: true, deep: true }<div class="py-3">Copy link to clipboard to share it.</div></template><template #controls>- <ButtonClipboard :text="metaData.fields.url" tabindex="1" />+ <ButtonClipboard :text="videoURL" tabindex="1" /></template></ModalBase></template>diff --git a/resources/js/composables/useMetaData.js b/resources/js/composables/useMetaData.jsindex f95b7676..5d82a698 100755--- a/resources/js/composables/useMetaData.js+++ b/resources/js/composables/useMetaData.js@@ -6,14 +6,14 @@ import { reactive } from 'vue';export default function useMetaData(data) {const route = useRoute();- return reactive({+ 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 + (data.id ? `?video=${data.id}` : '')),+ url: encodeURI(data?.skipBaseURL ? '' : document.location.origin + route.path + `?video=${data.id ?? ''}`),file_size: data.file_size ? formatFileSize(data.file_size) : '',},updateData(props) {@@ -21,8 +21,10 @@ export default function useMetaData(data) {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 + (data.id ? `?video=${data.id}` : ''));+ 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;}