A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: eager load the first 6 images on the home page
aminnausin2591f47ebc3c
diff --git a/resources/js/components/cards/data/BrowseFolderCard.vue b/resources/js/components/cards/data/BrowseFolderCard.vueindex c315c649..2e8e247b 100644--- a/resources/js/components/cards/data/BrowseFolderCard.vue+++ b/resources/js/components/cards/data/BrowseFolderCard.vue@@ -10,7 +10,7 @@ import LazyImage from '@/components/lazy/LazyImage.vue';import IconFolder from '@/components/icons/IconFolder.vue';-defineProps<{ folder: FolderResource }>();+defineProps<{ folder: FolderResource; eagerLoad?: boolean }>();</script><template><RouterLink@@ -29,6 +29,8 @@ defineProps<{ folder: FolderResource }>();:src="folder.series?.poster_image?.path ?? handleStorageURL(folder.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'":class="'aspect-2-3 w-full object-cover'":alt="folder.title"+ :fetch-priority="eagerLoad ? 'high' : 'auto'"+ :loading="eagerLoad ? 'eager' : 'lazy'"/><slot name="overlay"><PlayerOSDBase class="absolute bottom-1 left-1 h-6 min-w-6 p-0 text-[10px] tabular-nums">diff --git a/resources/js/components/cards/data/BrowseMediaCard.vue b/resources/js/components/cards/data/BrowseMediaCard.vueindex bf568080..0ed5a487 100644--- a/resources/js/components/cards/data/BrowseMediaCard.vue+++ b/resources/js/components/cards/data/BrowseMediaCard.vue@@ -11,15 +11,15 @@ import VideoPreview from '@/components/video/VideoPreview.vue';import CircumPlay1 from '~icons/circum/play-1';-const props = defineProps<{ video: VideoResource; forceAudio?: boolean }>();+const props = defineProps<{ media: VideoResource; forceAudio?: boolean; eagerLoad?: boolean }>();const mediaUrl = computed(() => {- if (!props.video.url) return '/';+ if (!props.media.url) return '/';- const url = new URL(props.video.url, window.location.origin);+ const url = new URL(props.media.url, window.location.origin);- if (props.video.progress_offset && props.video.metadata?.media_type === MediaType.VIDEO) {- url.searchParams.set('t', String(props.video.progress_offset));+ if (props.media.progress_offset && props.media.metadata?.media_type === MediaType.VIDEO) {+ url.searchParams.set('t', String(props.media.progress_offset));}return url.pathname + url.search;@@ -43,10 +43,11 @@ const mediaUrl = computed(() => {><div :class="cn('relative overflow-clip rounded-t-md shadow-sm', { 'rounded-b-md': FLAGS.USE_TRANSPARENT_HOME_CARDS })"><VideoPreview- :data="video"+ :data="media":data-active="false"- :poster-url="video.metadata?.poster_image?.path"- :is-audio="video.metadata?.media_type === MediaType.AUDIO"+ :eager-load="eagerLoad"+ :poster-url="media.metadata?.poster_image?.path"+ :is-audio="media.metadata?.media_type === MediaType.AUDIO":is-folder-majority-audio="forceAudio":class="cn('size-full dark:bg-neutral-950/80')":wrapper-class="cn('peer content-auto ', forceAudio ? 'aspect-square [contain-intrinsic-size:160px_160px]' : 'aspect-video [contain-intrinsic-size:224px_126px]')"@@ -57,8 +58,8 @@ const mediaUrl = computed(() => {'duration-input h-1 opacity-0 transition-opacity','dark:bg-primary-dark-800/70 dark:odd:bg-primary-dark-600 absolute bottom-0 left-0 w-full bg-neutral-50 odd:bg-neutral-100',{- 'opacity-100': video.progress_percentage,- 'peer-hover:opacity-0': video.metadata?.media_type === MediaType.VIDEO && video.storyboard,+ 'opacity-100': media.progress_percentage,+ 'peer-hover:opacity-0': media.metadata?.media_type === MediaType.VIDEO && media.storyboard,},)"@@ -70,11 +71,11 @@ const mediaUrl = computed(() => {'duration-input mt-auto bg-neutral-300 opacity-80 transition-[translate,opacity,margin] dark:bg-neutral-700 dark:opacity-60',)"- :title="`Progress: ${video.progress_percentage}%`"+ :title="`Progress: ${media.progress_percentage}%`"><div:class="cn('bg-foreground-3 duration-input mt-auto h-full w-full transition-[background-color]', 'playback-progress-fill')"- :style="{ width: `${video.progress_percentage}%` }"+ :style="{ width: `${media.progress_percentage}%` }"></div></div></div>@@ -96,8 +97,8 @@ const mediaUrl = computed(() => {</div><div class="flex w-full flex-col px-2 pb-2 text-xs"><slot name="title">- <p class="truncate" :title="video.title">- {{ video.title }}+ <p class="truncate" :title="media.title">+ {{ media.title }}</p></slot><slot />diff --git a/resources/js/components/cards/data/RecentlyUploadedCard.vue b/resources/js/components/cards/data/RecentlyUploadedCard.vueindex 75902d3c..2b29a947 100644--- a/resources/js/components/cards/data/RecentlyUploadedCard.vue+++ b/resources/js/components/cards/data/RecentlyUploadedCard.vue@@ -5,11 +5,11 @@ import { toTimeSpan } from '@/service/util';import BrowseMediaCard from '@/components/cards/data/BrowseMediaCard.vue';-defineProps<{ video: VideoResource }>();+defineProps<{ media: VideoResource }>();</script><template>- <BrowseMediaCard :video="video" v-bind="$attrs">- <span class="text-foreground-1">Uploaded {{ toTimeSpan(video.created_at, '') }}</span>+ <BrowseMediaCard :media="media" v-bind="$attrs">+ <span class="text-foreground-1">Uploaded {{ toTimeSpan(media.created_at, '') }}</span></BrowseMediaCard></template>diff --git a/resources/js/components/cards/data/RecentlyWatchedCard.vue b/resources/js/components/cards/data/RecentlyWatchedCard.vueindex 979e96a9..c189785d 100644--- a/resources/js/components/cards/data/RecentlyWatchedCard.vue+++ b/resources/js/components/cards/data/RecentlyWatchedCard.vue@@ -5,11 +5,11 @@ import { toTimeSpan } from '@/service/util';import BrowseMediaCard from '@/components/cards/data/BrowseMediaCard.vue';-defineProps<{ video: VideoResource }>();+defineProps<{ media: VideoResource }>();</script><template>- <BrowseMediaCard :video="video">- <span v-if="video.progress_updated_at" class="text-foreground-1">Watched {{ toTimeSpan(video.progress_updated_at, '') }}</span>+ <BrowseMediaCard :media="media">+ <span v-if="media.progress_updated_at" class="text-foreground-1">Watched {{ toTimeSpan(media.progress_updated_at, '') }}</span></BrowseMediaCard></template>diff --git a/resources/js/components/lazy/LazyImage.vue b/resources/js/components/lazy/LazyImage.vueindex 5c61d198..f6aa2023 100644--- a/resources/js/components/lazy/LazyImage.vue+++ b/resources/js/components/lazy/LazyImage.vue@@ -9,9 +9,19 @@ import ProIconsPhotoOff from '@/components/icons/ProIconsPhotoOff.vue';defineOptions({ inheritAttrs: false });-const props = withDefaults(defineProps<{ src?: string; alt?: string; loading?: ImgHTMLAttributes['loading']; wrapperClass?: HTMLAttributes['class']; animate?: boolean }>(), {- loading: 'lazy',-});+const props = withDefaults(+ defineProps<{+ src?: string;+ alt?: string;+ loading?: ImgHTMLAttributes['loading'];+ fetchPriority?: ImgHTMLAttributes['fetchpriority'];+ wrapperClass?: HTMLAttributes['class'];+ animate?: boolean;+ }>(),+ {+ loading: 'lazy',+ },+);const attrs = useAttrs();const isLoading = ref(false);@@ -39,6 +49,7 @@ watch(<imgv-bind="attrs":loading="loading"+ :fetchpriority="fetchPriority":alt="isError || !isLoaded ? '' : alt":src="src":class="[{ 'lazy-image transition-opacity duration-700 ease-in-out': animate }, { loaded: isLoaded }]"diff --git a/resources/js/components/video/VideoPreview.vue b/resources/js/components/video/VideoPreview.vueindex 8979723b..2da2908b 100644--- a/resources/js/components/video/VideoPreview.vue+++ b/resources/js/components/video/VideoPreview.vue@@ -19,6 +19,7 @@ const props = defineProps<{data: VideoResource;dataActive: boolean;posterUrl?: string;+ eagerLoad?: boolean;isAudio?: boolean;isFolderMajorityAudio?: boolean;wrapperClass?: string;@@ -190,10 +191,11 @@ defineExpose({ hovered });<div class="absolute inset-0 scale-120 blur-sm" :style="generatePosterStyle(posterUrl)"></div><LazyImage- :src="posterUrl"alt="poster"+ :loading="eagerLoad ? 'eager' : 'lazy'"+ :fetchPriority="eagerLoad ? 'high' : 'auto'"+ :src="posterUrl":animate="false"- loading="lazy":wrapper-class="cn('transition-opacity duration-input', { 'opacity-0': hovered && activeCue })":class="cn('absolute inset-0 size-full object-contain')"/>diff --git a/resources/js/views/HomeView.vue b/resources/js/views/HomeView.vueindex cde8dd36..5a2f18d1 100644--- a/resources/js/views/HomeView.vue+++ b/resources/js/views/HomeView.vue@@ -38,7 +38,7 @@ onMounted(() => {:item-count="continueWatching?.length":is-loading="isLoadingContinueWatching">- <RecentlyWatchedCard class="3xl:w-76" v-for="video in continueWatching" :key="video.id" :video="video" />+ <RecentlyWatchedCard class="3xl:w-76" v-for="(media, index) in continueWatching" :key="media.id" :media="media" :eagerLoad="index < 2" /></HomeShelf><HomeShelf@@ -48,7 +48,7 @@ onMounted(() => {:is-loading="isLoadingRecentlyUpdated":no-data-message="'Nothing released yet'">- <BrowseFolderCard v-for="folder in recentlyUpdated" :key="folder.id" :folder="folder">+ <BrowseFolderCard v-for="(folder, index) in recentlyUpdated" :key="folder.id" :folder="folder" :eagerLoad="index < 2"><span v-if="folder.series?.updated_at" class="text-foreground-1 truncate"> Updated {{ toTimeSpan(folder.series?.updated_at, '') }} </span></BrowseFolderCard></HomeShelf>@@ -86,7 +86,7 @@ onMounted(() => {:item-count="recentlyUploaded?.length":is-loading="isLoadingRecentlyUploaded">- <RecentlyUploadedCard class="3xl:w-76" v-for="video in recentlyUploaded" :key="video.id" :video="video" />+ <RecentlyUploadedCard class="3xl:w-76" v-for="media in recentlyUploaded" :key="media.id" :media="media" /></HomeShelf><HomeShelf@@ -96,7 +96,7 @@ onMounted(() => {:item-count="recentlyUploadedMusic?.length":is-loading="isLoadingRecentlyUploadedMusic">- <RecentlyUploadedCard v-for="video in recentlyUploadedMusic" :key="video.id" :video="video" :force-audio="true" class="w-40" />+ <RecentlyUploadedCard v-for="media in recentlyUploadedMusic" :key="media.id" :media="media" :force-audio="true" class="w-40" /></HomeShelf></div></template>