Skip to content

A self-hosted media server and file management system

feat: update frontend to accept new image structure

aminnausin6832bd44b55a
diff --git a/resources/js/components/video/PlayerBackdrop.vue b/resources/js/components/video/PlayerBackdrop.vue
index cb89e155..c41aa7c0 100644
--- a/resources/js/components/video/PlayerBackdrop.vue
+++ b/resources/js/components/video/PlayerBackdrop.vue
@@ -16,7 +16,6 @@ const props = defineProps<{
isPortrait: boolean;
isAspectVideo: boolean;
};
- audioPosterUrl: string;
posterUrl?: string;
}>();
@@ -39,10 +38,10 @@ const generatePosterStyle = (url?: string): HTMLAttributes['style'] => {
<div
id="audio-poster"
:class="['transition-scale absolute inset-0 -z-1 scale-105 blur-sm ease-in-out', { 'dark:scale-100': isPlayerSizeConstrained }]"
- :style="generatePosterStyle(audioPosterUrl)"
+ :style="generatePosterStyle(posterUrl)"
></div>
<LazyImage
- :src="audioPosterUrl"
+ :src="posterUrl"
alt="album art"
wrapper-class="flex items-center justify-center"
:class="['mx-auto min-h-64 object-contain select-none md:h-screen', { 'max-h-[71vh]': isPlayerSizeConstrained }, { 'max-h-screen': isTheatreView }]"
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vue
index bb38bdf6..2226d108 100755
--- a/resources/js/components/video/VideoInfoPanel.vue
+++ b/resources/js/components/video/VideoInfoPanel.vue
@@ -302,7 +302,7 @@ onMounted(() => {
alt="Folder Cover Art"
fetchpriority="high"
loading="eager"
- :src="handleStorageURL(stateFolder?.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'"
+ :src="stateFolder?.series?.poster_image?.path ?? handleStorageURL(stateFolder?.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'"
/>
<ButtonIcon
diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vue
index ce74c270..9f79d436 100755
--- a/resources/js/components/video/VideoPlayer.vue
+++ b/resources/js/components/video/VideoPlayer.vue
@@ -188,7 +188,7 @@ const isFullScreen = computed(() => viewMode.value == 'fullscreen');
const isTheatreView = computed(() => viewMode.value === 'theatre');
const isNormalView = computed(() => viewMode.value === 'normal');
-const isThumbnailVisible = computed(() => !!stateVideo.value.metadata?.poster_url && !isThumbnailDismissed.value);
+const isThumbnailVisible = computed(() => !!posterUrl.value && !isThumbnailDismissed.value);
//#endregion
@@ -434,6 +434,13 @@ const audioPoster = computed(() => {
return handleStorageURL(stateVideo.value?.metadata?.poster_url) ?? handleStorageURL(stateFolder.value.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp';
});
+const posterUrl = computed(() => {
+ const url = stateVideo.value.metadata?.poster_image?.path ?? handleStorageURL(stateVideo.value?.metadata?.poster_url);
+ const audioFallback = handleStorageURL(stateFolder.value.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp';
+
+ return isAudio.value ? (url ?? audioFallback) : url;
+});
+
const initVideoPlayer = async (previousId: number) => {
if (stateVideo.value.id === currentId.value || stateVideo.value.id === previousId) {
// Only reset metadata on statevideo update if id is the same
@@ -1375,8 +1382,7 @@ defineExpose({
<!-- The thumbnail or blurred copy of the album art as a backdrop to the clear art (Z-3) -->
<PlayerBackdrop
:aspect-ratio="aspectRatio"
- :audio-poster-url="audioPoster"
- :poster-url="stateVideo.metadata?.poster_url"
+ :poster-url="posterUrl ?? undefined"
:is-visible="isAudio || isThumbnailVisible"
:is-theatre-view="isTheatreView"
:is-player-size-constrained="isPlayerSizeConstrained"
diff --git a/resources/js/contracts/media.ts b/resources/js/contracts/media.ts
index 72e62943..065cbf9a 100644
--- a/resources/js/contracts/media.ts
+++ b/resources/js/contracts/media.ts
@@ -58,6 +58,7 @@ export interface SeriesResource {
updated_at?: string;
edited_at?: string;
downloads_enabled: boolean;
+ poster_image?: ImageResource;
}
//#endregion
@@ -80,7 +81,10 @@ export interface MetadataResource {
lyrics?: string;
// episode?: number;
// season?: number;
+
poster_url?: string;
+ poster_image?: ImageResource;
+
artist?: string;
album?: string;
// released_at?: string;
@@ -161,4 +165,10 @@ export interface StoryboardResource {
interval_seconds: number;
}
+export interface ImageResource {
+ id: number;
+ path: string;
+ blurHash?: string;
+}
+
//#endregion