Skip to content

A self-hosted media server and file management system

feat: add generate preview image link to image editor when empty

aminnausin1e6f74b7804b
diff --git a/app/Http/Resources/VideoResource.php b/app/Http/Resources/VideoResource.php
index ce69e1d7..b83fc143 100755
--- a/app/Http/Resources/VideoResource.php
+++ b/app/Http/Resources/VideoResource.php
@@ -55,6 +55,7 @@ class VideoResource extends JsonResource {
'completion_count' => $metadata?->playbackProgress?->completion_count ?? 0,
'metadata' => new MetadataResource($metadata),
+ 'folder_id' => $this->folder_id,
];
}
}
diff --git a/resources/js/components/cards/data/VideoCard.vue b/resources/js/components/cards/data/VideoCard.vue
index 829eeee4..f9d31271 100644
--- a/resources/js/components/cards/data/VideoCard.vue
+++ b/resources/js/components/cards/data/VideoCard.vue
@@ -85,7 +85,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => [
{
icon: ProiconsPhoto,
text: 'Edit Images',
- action: () => handleEditMediaImages(videoData),
+ action: () => handleEditMediaImages(videoData, stateDirectory.value.id),
hidden: !isAuthenticated.value,
},
]);
diff --git a/resources/js/components/forms/EditImages.vue b/resources/js/components/forms/EditImages.vue
index 0eee1e5f..9ce62c64 100644
--- a/resources/js/components/forms/EditImages.vue
+++ b/resources/js/components/forms/EditImages.vue
@@ -18,11 +18,14 @@ import TablerUpload from '@/components/icons/TablerUpload.vue';
import ImageCard from '@/components/cards/data/ImageCard.vue';
import useForm from '@/composables/useForm';
+import CircumShare1 from '~icons/circum/share-1';
+
const { pending, addFile, addUrl, removePending, cleanup } = useImageManager();
const props = defineProps<{
images: ImageResource[];
filters?: T[];
+ generatableFilters?: { [key: string]: { url: string; text: string; target?: string } };
primaryIds?: Partial<Record<T, number>>;
isAudio?: boolean;
readOnlyTypes?: T[];
@@ -395,10 +398,12 @@ onUnmounted(() => {
</div>
</div>
- <div v-else class="text-foreground-1 flex w-full flex-1 items-center justify-center gap-1 py-8 tracking-widest">
- <ProIconsPhotoOff class="size-6" />
- <span> No images yet </span>
- </div>
+ <template v-else>
+ <div class="text-foreground-1 flex w-full flex-1 flex-wrap items-center justify-center gap-1 py-8 tracking-widest">
+ <ProIconsPhotoOff class="size-6" />
+ <span> No images yet </span>
+ </div>
+ </template>
<template v-if="deletedImages.length > 0">
<div class="text-foreground-2 flex w-full items-center justify-between gap-2 text-xs">
@@ -450,32 +455,46 @@ onUnmounted(() => {
<FormErrorList class="w-full text-center" v-if="form.errors" :errors="form.errors" />
- <ModalFormFooter v-if="!isReadOnly" class="mt-auto h-fit">
- <ButtonBase
- v-if="openEditorFn"
- variant="transparent"
- type="button"
- class="text-foreground-2 hover:text-foreground-0 xs:-ms-1 xs:mr-auto xs:max-h-none xs:px-1 max-h-6 gap-1.5 p-0 text-xs transition-colors"
- @click="openEditorFn"
- >
- <ProIconsPhoto class="size-3.5" />
- Edit Metadata
- </ButtonBase>
- <ButtonForm variant="reset" class="h-9" :disabled="form.processing" @click="$emit('handleFinish')"> Cancel </ButtonForm>
- <ButtonForm
- variant="danger"
- :class="
- cn('transition-reveal h-9 overflow-hidden', {
- 'xs:mx-0 xs:w-18 h-9 py-2 opacity-100': isDirty,
- 'xs:-mx-1 xs:mt-0 xs:h-9 xs:w-0 xs:px-0 xs:py-2 -mt-2 h-0 w-full py-0 opacity-0!': !isDirty,
- })
- "
- :disabled="form.processing"
- @click="resetForm"
- >
- Reset
- </ButtonForm>
- <ButtonForm variant="submit" class="h-9" :disabled="form.processing" @click="handleSubmit"> Save </ButtonForm>
+ <ModalFormFooter class="mt-auto h-fit">
+ <template v-if="!isReadOnly">
+ <ButtonBase
+ v-if="openEditorFn"
+ variant="transparent"
+ type="button"
+ class="text-foreground-2 hover:text-foreground-0 xs:-ms-1 xs:mr-auto xs:max-h-none xs:px-1 max-h-6 gap-1.5 p-0 text-xs transition-colors"
+ @click="openEditorFn"
+ >
+ <ProIconsPhoto class="size-3.5" />
+ Edit Metadata
+ </ButtonBase>
+ <ButtonForm variant="reset" class="h-9" :disabled="form.processing" @click="$emit('handleFinish')"> Cancel </ButtonForm>
+ <ButtonForm
+ variant="danger"
+ :class="
+ cn('transition-reveal h-9 overflow-hidden', {
+ 'xs:mx-0 xs:w-18 h-9 py-2 opacity-100': isDirty,
+ 'xs:-mx-1 xs:mt-0 xs:h-9 xs:w-0 xs:px-0 xs:py-2 -mt-2 h-0 w-full py-0 opacity-0!': !isDirty,
+ })
+ "
+ :disabled="form.processing"
+ @click="resetForm"
+ >
+ Reset
+ </ButtonForm>
+ <ButtonForm variant="submit" class="h-9" :disabled="form.processing" @click="handleSubmit"> Save </ButtonForm>
+ </template>
+ <template v-else>
+ <ButtonBase
+ v-if="generatableFilters?.[filteredType]"
+ variant="transparent"
+ type="button"
+ class="text-foreground-2 hover:text-foreground-0 xs:max-h-none xs:px-1 max-h-6 gap-1.5 p-0 text-xs transition-colors"
+ :to="generatableFilters[filteredType].url"
+ :target="generatableFilters[filteredType].target ?? '_blank'"
+ >
+ <CircumShare1 class="size-3.5" /> {{ generatableFilters[filteredType].text }}
+ </ButtonBase>
+ </template>
</ModalFormFooter>
</form>
</template>
diff --git a/resources/js/components/forms/EditVideo.vue b/resources/js/components/forms/EditVideo.vue
index c9c530f5..e052992b 100755
--- a/resources/js/components/forms/EditVideo.vue
+++ b/resources/js/components/forms/EditVideo.vue
@@ -26,8 +26,8 @@ import ProIconsPhoto from '@/components/icons/ProIconsPhoto.vue';
import mediaAPI from '@/service/mediaAPI.ts';
import useForm from '@/composables/useForm';
+const { stateFolder, stateDirectory } = storeToRefs(useContentStore());
const { data: tagsQuery } = useGetAllTags();
-const { stateFolder } = storeToRefs(useContentStore());
const createTag = UseCreateTag();
@@ -257,7 +257,7 @@ watch(tagsQuery, () => {
variant="transparent"
type="button"
class="text-foreground-2 hover:text-foreground-0 xs:-ms-1 xs:mr-auto xs:max-h-none xs:px-1 max-h-6 gap-1.5 p-0 text-xs transition-colors"
- @click="() => handleEditMediaImages(props.video)"
+ @click="() => handleEditMediaImages(props.video, stateDirectory.id)"
>
<ProIconsPhoto class="size-3.5" />
Edit Images
diff --git a/resources/js/components/modals/EditFolderImagesModal.vue b/resources/js/components/modals/EditFolderImagesModal.vue
index e8b1f42d..e3406d48 100644
--- a/resources/js/components/modals/EditFolderImagesModal.vue
+++ b/resources/js/components/modals/EditFolderImagesModal.vue
@@ -57,8 +57,9 @@ const invalidateQueries = async () => {
<EditImages
:filters="['poster', 'banner', 'preview']"
:readOnlyTypes="['preview']"
- :primary-ids="{ poster: modalProps.resource.poster_image?.id, banner: modalProps.resource.primary_banner_id }"
+ :generatable-filters="{ preview: { url: `/${modalProps.folderResource.category_id}/${modalProps.folderResource.id}?preview=1`, text: 'Generate preview in new tab' } }"
:images="modalProps.images"
+ :primary-ids="{ poster: modalProps.resource.poster_image?.id, banner: modalProps.resource.primary_banner_id }"
:is-audio="modalProps.isMajorityAudio"
:submit-fn="(formData) => updateSeriesImage(modalProps.resource.id, formData)"
:open-editor-fn="() => modal.open(EditFolderModal, { cachedFolder: modalProps.folderResource })"
diff --git a/resources/js/components/modals/EditMediaImagesModal.vue b/resources/js/components/modals/EditMediaImagesModal.vue
index d63b4a66..c86b3112 100644
--- a/resources/js/components/modals/EditMediaImagesModal.vue
+++ b/resources/js/components/modals/EditMediaImagesModal.vue
@@ -40,6 +40,12 @@ const handleVideoDetailsUpdate = (data: VideoResource) => {
:filters="['poster', 'preview']"
:readOnlyTypes="['preview']"
:primary-ids="{ poster: modalProps.resource.poster_image?.id }"
+ :generatable-filters="{
+ preview: {
+ url: `/${modalProps.libraryId}/${modalProps.mediaResource.folder_id}?video=${modalProps.mediaResource.id}&preview=1`,
+ text: 'Generate preview in new tab',
+ },
+ }"
:images="modalProps.images"
:is-audio="modalProps.resource.media_type === MediaType.AUDIO"
:submit-fn="(formData) => updateMediaImage(modalProps.resource.id, formData)"
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vue
index 49df5d20..0549be1d 100755
--- a/resources/js/components/video/VideoInfoPanel.vue
+++ b/resources/js/components/video/VideoInfoPanel.vue
@@ -87,7 +87,7 @@ const popoverItems = computed(() => {
{
icon: ProiconsPhoto,
text: 'Edit Images',
- action: () => handleEditMediaImages(stateVideo.value),
+ action: () => handleEditMediaImages(stateVideo.value, stateDirectory.value.id),
hidden: !isAuthenticated.value,
},
{
diff --git a/resources/js/contracts/media.ts b/resources/js/contracts/media.ts
index 16a57968..7b903001 100644
--- a/resources/js/contracts/media.ts
+++ b/resources/js/contracts/media.ts
@@ -149,6 +149,7 @@ export interface VideoResource {
progress_offset: number;
progress_percentage: number;
completion_count: number;
+ folder_id?: number;
}
export interface SubtitleResource {
diff --git a/resources/js/service/media/mediaActions.ts b/resources/js/service/media/mediaActions.ts
index 6659d159..378a029c 100644
--- a/resources/js/service/media/mediaActions.ts
+++ b/resources/js/service/media/mediaActions.ts
@@ -6,7 +6,7 @@ import { toast } from '@aminnausin/cedar-ui';
import EditMediaImagesModal from '@/components/modals/EditMediaImagesModal.vue';
-export function handleEditMediaImages(media: VideoResource) {
+export function handleEditMediaImages(media: VideoResource, libraryId?: number) {
if (!media.metadata?.id) return toast.error('ID Missing');
const modal = useModalStore();
@@ -16,6 +16,7 @@ export function handleEditMediaImages(media: VideoResource) {
title: `Edit Media Images`,
resource: media.metadata,
mediaResource: media,
+ libraryId,
images: media.metadata.images ?? [],
...metadataInfo,
});
diff --git a/resources/js/types/modals.ts b/resources/js/types/modals.ts
index ed57f049..9d03ef46 100644
--- a/resources/js/types/modals.ts
+++ b/resources/js/types/modals.ts
@@ -12,6 +12,7 @@ export interface FolderImageEditorProps {
export interface MediaImageEditorProps {
resource: MetadataResource;
mediaResource: VideoResource;
+ libraryId?: number;
images: ImageResource[];
title?: string;
}