A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: use 0 and null for unset id for content store and video player (standardise at a later date but refrain from using -1)
aminnausin84f2d43b6292
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vueindex 6c0f212d..e3ced49a 100755--- a/resources/js/components/video/VideoInfoPanel.vue+++ b/resources/js/components/video/VideoInfoPanel.vue@@ -38,7 +38,7 @@ const popover = useTemplateRef('popover');const modal = useModalStore();const route = useRoute();-const personalViewCount = ref(-1);+const personalViewCount = ref<number | null>(null);const isOverflowing = ref(false);const isExpanded = ref(false);@@ -81,13 +81,13 @@ watch(}if (!userData.value?.id || !stateVideo.value.metadata) {- personalViewCount.value = -1;+ personalViewCount.value = null;return;}const { data } = await getUserViewCount(stateVideo.value.metadata.id);- personalViewCount.value = isNaN(parseInt(data)) ? -1 : parseInt(data);+ personalViewCount.value = isNaN(parseInt(data)) ? null : parseInt(data);},{ immediate: true, deep: true },);@@ -95,7 +95,7 @@ watch(watch(() => userData.value,() => {- if (!userData.value?.id) personalViewCount.value = -1;+ if (!userData.value?.id) personalViewCount.value = null;},);@@ -170,16 +170,16 @@ onMounted(() => {<li><BadgeTag :class="'meta-badge gap-0.5'">{{ views }}- <HoverCard :content="`You have viewed this ${personalViewCount} time${personalViewCount == 1 ? '' : 's'}`">+ <HoverCard :content="`You have viewed this ${personalViewCount} time${personalViewCount == 1 ? '' : 's'}`" v-if="personalViewCount"><template #trigger>- <ProiconsEye class="size-4 scale-90 transition-all hover:scale-100 hover:text-neutral-400 dark:hover:text-white" v-if="personalViewCount > 0" />+ <ProiconsEye class="size-4 scale-90 transition-all hover:scale-100 hover:text-neutral-400 dark:hover:text-white" /></template></HoverCard></BadgeTag></li>- <li v-if="stateVideo?.metadata?.resolution_height">- <BadgeTag :label="stateVideo?.metadata?.resolution_height + 'p'" :class="'meta-badge'" />+ <li v-if="stateVideo.metadata?.resolution_height">+ <BadgeTag :label="stateVideo.metadata.resolution_height + 'p'" :class="'meta-badge'" /></li><li v-if="stateVideo.date_uploaded"><BadgeTag@@ -285,9 +285,9 @@ onMounted(() => {<div class="hidden h-[22px] items-center justify-start gap-1 truncate sm:flex"><p class="lowercase">{{ views }}</p>- <HoverCard :content="`You have viewed this ${personalViewCount} time${personalViewCount == 1 ? '' : 's'}`">+ <HoverCard :content="`You have viewed this ${personalViewCount} time${personalViewCount == 1 ? '' : 's'}`" v-if="personalViewCount"><template #trigger>- <ProiconsEye class="size-4 scale-90 transition-all hover:scale-100 hover:text-neutral-400 dark:hover:text-white" v-if="personalViewCount > 0" />+ <ProiconsEye class="size-4 scale-90 transition-all hover:scale-100 hover:text-neutral-400 dark:hover:text-white" /></template></HoverCard><template v-if="stateVideo?.metadata?.resolution_height">diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vueindex 037ad9a4..7ff21f31 100755--- a/resources/js/components/video/VideoPlayer.vue+++ b/resources/js/components/video/VideoPlayer.vue@@ -120,7 +120,7 @@ const { stateVideo, stateFolder, nextVideoURL, previousVideoURL } = storeToRefs(// API Cacheconst progressCache = ref<{ metadata_id: number; progress: number }[]>([]);const metadataId = ref<number>(NaN);-const currentId = ref(-1);+const currentId = ref<number | null>(null);// APIconst { data: playbackData } = useVideoPlayback(metadataId);@@ -396,7 +396,7 @@ const initVideoPlayer = async () => {isLooping.value = false;currentSpeed.value = 1;- currentId.value = -1;+ currentId.value = null;bufferPercentage.value = 0;bufferTime.value = 0;@@ -549,7 +549,7 @@ const onPlayerPause = () => {};const onPlayerEnded = () => {- currentId.value = -1;+ currentId.value = null;if (isLooping.value) {onPlayerPlay();return;@@ -745,7 +745,7 @@ const handlePlayerTimeUpdate = (event: any) => {getBufferHealth();// if playing or have not started playing yet, force seek (I do not remember what this is for)- if (isShowingControls.value && (!isPaused.value || (currentId.value === -1 && timeElapsed.value))) {+ if (isShowingControls.value && (!isPaused.value || (currentId.value === null && timeElapsed.value))) {timeElapsed.value = (event.target.currentTime / timeDuration.value) * 100;}};@@ -1464,7 +1464,7 @@ defineExpose({v-cloak><div- v-show="isPaused && currentId !== -1"+ v-show="isPaused && currentId !== null"class="bg-opacity-40 xs:p-4 flex aspect-square items-center justify-center rounded-full p-3 text-transparent drop-shadow-lg"><ProiconsPlay :class="`xs:h-8 xs:w-8 *:stroke-1!`" />diff --git a/resources/js/stores/ContentStore.ts b/resources/js/stores/ContentStore.tsindex e192eed9..4f7407ff 100644--- a/resources/js/stores/ContentStore.ts+++ b/resources/js/stores/ContentStore.ts@@ -15,9 +15,9 @@ import mediaAPI from '@/service/mediaAPI.ts';// dir: {id: 1, name: 'anime', folders: ["id": "6", "name": "Frieren", "path": "anime/Frieren", "file_count": 28, "category_id": "1","series": null] } -> api/categories/1 -> folders dont hold video data// folder: {id: 11, name: 'BOCCHI THE ROCK', videos: [id, name, pat, date, metadata], series: {}}-const emptyLibrary: CategoryResource = { id: -1, name: '', folders: [], folders_count: 0, total_size: 0, last_scan: -1 };-const emptyFolder: FolderResource = { id: -1, name: '', title: '', path: '', file_count: 0, total_size: 0, is_majority_audio: false, category_id: -1, videos: [], last_scan: -1 };-const emptyMedia: VideoResource = { id: -1, name: '', path: '', view_count: 0, video_tags: [], date: '', date_created: '' };+const emptyLibrary: CategoryResource = { id: 0, name: '', folders: [], folders_count: 0, total_size: 0, last_scan: -1 };+const emptyFolder: FolderResource = { id: 0, name: '', title: '', path: '', file_count: 0, total_size: 0, is_majority_audio: false, category_id: 0, videos: [], last_scan: -1 };+const emptyMedia: VideoResource = { id: 0, name: '', path: '', view_count: 0, video_tags: [], date: '', date_created: '' };const DEFAULT_SORT = { column: 'name', dir: 1 };