A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: reduce reliance on thumbnail_url
aminnausin0d431f66837f
diff --git a/app/Http/Resources/SeriesResource.php b/app/Http/Resources/SeriesResource.phpindex 97ef508b..d0669669 100644--- a/app/Http/Resources/SeriesResource.php+++ b/app/Http/Resources/SeriesResource.php@@ -33,9 +33,9 @@ class SeriesResource extends JsonResource {'edited_at' => $this->edited_at,'downloads_enabled' => $this->downloads_enabled,- 'thumbnail_url' => $this->thumbnail_url,+ 'thumbnail_url' => $this->whenLoaded('images', count($this->images), 0) === 0 ? $this->thumbnail_url : null,'poster_image' => $this->primaryPoster ? new ImageResource($this->primaryPoster) : null,- 'images' => ImageResource::collection($this->images),+ 'images' => ImageResource::collection($this->whenLoaded('images', $this->images, [])),];}}diff --git a/resources/js/components/cards/data/FolderCard.vue b/resources/js/components/cards/data/FolderCard.vueindex 6400f872..09208ff0 100644--- a/resources/js/components/cards/data/FolderCard.vue+++ b/resources/js/components/cards/data/FolderCard.vue@@ -70,7 +70,7 @@ const mediaType = computed(() => {><template #content><LazyImage- :src="handleStorageURL(data.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'"+ :src="data.series?.poster_image?.path ?? handleStorageURL(data.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'"alt="Folder Thumbnail"class="aspect-2-3 content-auto hidden h-32 object-cover shadow-md [contain-intrinsic-size:auto_128px] lg:block"loading="lazy"@@ -88,7 +88,7 @@ const mediaType = computed(() => {><LazyImagealt="Folder Thumbnail"- :src="handleStorageURL(data.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'"+ :src="data.series?.poster_image?.path ?? handleStorageURL(data.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'":wrapper-class="cn('w-full sm:w-fit h-fit relative dark:bg-black/10', {'sm:h-24 sm:group-hover:h-31 transition-height lg:h-fit lg:group-hover:h-fit': (data.series?.folder_tags?.length ?? 0) > 0,diff --git a/resources/js/components/cards/data/LibraryCard.vue b/resources/js/components/cards/data/LibraryCard.vueindex 87af115e..c9b30ef2 100644--- a/resources/js/components/cards/data/LibraryCard.vue+++ b/resources/js/components/cards/data/LibraryCard.vue@@ -127,7 +127,7 @@ watch(<RouterLink :to="`/dashboard/libraries/${data?.id}`" class="peer content-auto h-40 w-full [contain-intrinsic-size:auto_160px] focus:-outline-offset-2" title="View Folders"><LazyImageclass="peer mb-auto h-full w-full rounded-t-xl object-cover shadow-xs ring-1 ring-gray-900/5 ring-inset hover:ring-4"- :src="handleStorageURL(defaultFolder?.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'"+ :src="defaultFolder?.series?.poster_image?.path ?? handleStorageURL(defaultFolder?.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'"alt="Folder Cover Art"/><span class="absolute inset-0 flex h-full w-full flex-col items-end gap-2 rounded-t-xl p-2.5">diff --git a/resources/js/components/cards/data/LibraryFolderCard.vue b/resources/js/components/cards/data/LibraryFolderCard.vueindex 8f8d5fe9..01cab14b 100644--- a/resources/js/components/cards/data/LibraryFolderCard.vue+++ b/resources/js/components/cards/data/LibraryFolderCard.vue@@ -66,7 +66,7 @@ const handleToggleDownloads = async (id: number, currentValue: boolean) => {<RouterLink :to="`/${encodeURI(data.path)}`" class="content-auto h-40 w-full rounded-t-xl [contain-intrinsic-size:auto_160px] focus:-outline-offset-2"><LazyImageclass="mb-auto h-full w-full object-cover shadow-xs ring-1 ring-gray-900/5"- :src="handleStorageURL(data?.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'"+ :src="data?.series?.poster_image?.path ?? handleStorageURL(data?.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'"alt="Folder Cover Art"/>diff --git a/resources/js/components/cards/data/VideoCard.vue b/resources/js/components/cards/data/VideoCard.vueindex a071c711..cfd8be38 100644--- a/resources/js/components/cards/data/VideoCard.vue+++ b/resources/js/components/cards/data/VideoCard.vue@@ -50,7 +50,7 @@ const isAudio = computed(() => {const posterUrl = computed(() => {const url = videoData.metadata?.poster_image?.path;- const audioFallback = handleStorageURL(stateFolder.value.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp';+ const audioFallback = stateFolder.value.series?.poster_image?.path ?? handleStorageURL(stateFolder.value.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp';return isAudio.value ? (url ?? audioFallback) : url;});diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vueindex f02b5a31..73f98b31 100755--- a/resources/js/components/video/VideoPlayer.vue+++ b/resources/js/components/video/VideoPlayer.vue@@ -431,12 +431,17 @@ const aspectRatio = computed(() => {});const audioPoster = computed(() => {- return stateVideo.value.metadata?.poster_image?.path ?? handleStorageURL(stateFolder.value.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp';+ return (+ stateVideo.value.metadata?.poster_image?.path ??+ stateFolder.value.series?.poster_image?.path ??+ handleStorageURL(stateFolder.value.series?.thumbnail_url) ??+ '/storage/thumbnails/default.webp'+ );});const posterUrl = computed(() => {const url = stateVideo.value.metadata?.poster_image?.path;- const audioFallback = handleStorageURL(stateFolder.value.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp';+ const audioFallback = stateFolder.value.series?.poster_image?.path ?? handleStorageURL(stateFolder.value.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp';return isAudio.value ? (url ?? audioFallback) : url;});@@ -505,7 +510,7 @@ const handleInitMediaSession = () => {// This uses series image unlike the regular posterUrl// TODO: Fix- const artworkURL = posterUrl.value || handleStorageURL(stateFolder.value.series?.thumbnail_url) || new URL('/storage/thumbnails/default.webp', globalThis.location.origin).href;+ const artworkURL = posterUrl.value ?? handleStorageURL(stateFolder.value.series?.thumbnail_url) ?? new URL('/storage/thumbnails/default.webp', globalThis.location.origin).href;const studioName = stateVideo.value.metadata?.artist ?? stateFolder.value?.series?.studio;const folderName = stateVideo.value.metadata?.album ?? stateFolder.value.series?.title ?? stateFolder.value.name;