Skip to content

A self-hosted media server and file management system

feat: generate preview images in place on image editor modals

aminnausin9911d51995f1
diff --git a/app/Services/PreviewGeneratorService.php b/app/Services/PreviewGeneratorService.php
index 328f0bf8..80c4ee5c 100644
--- a/app/Services/PreviewGeneratorService.php
+++ b/app/Services/PreviewGeneratorService.php
@@ -59,7 +59,9 @@ class PreviewGeneratorService {
}
if ($imageOnly) {
- return redirect()->to($viewData['thumbnail_url']);
+ $url = $viewData['thumbnail_url'];
+
+ return redirect()->to($url . (str_contains($url, '?') ? '&' : '?') . 't=' . time());
}
return response()->view($outputTemplate, $viewData);
diff --git a/resources/js/components/forms/EditImages.vue b/resources/js/components/forms/EditImages.vue
index 0428ca7a..5a37380b 100644
--- a/resources/js/components/forms/EditImages.vue
+++ b/resources/js/components/forms/EditImages.vue
@@ -6,6 +6,7 @@ import type { ImageResource, ImageType } from '@/types/resources';
import { computed, nextTick, onMounted, onUnmounted, reactive, ref, useTemplateRef, watch } from 'vue';
import { ButtonBase, ButtonForm, ButtonText } from '@/components/cedar-ui/button';
import { InputShell, TextInput } from '@/components/cedar-ui/input';
+import { usePreviewGenerator } from '@/service/editor/usePreviewGenerator';
import { useImageManager } from '@/composables/editor/useImageManager';
import { FormErrorList } from '@/components/cedar-ui/form';
import { cn, toast } from '@aminnausin/cedar-ui';
@@ -15,17 +16,17 @@ import ModalFormFooter from '@/components/forms/ModalFormFooter.vue';
import ImageCard from '@/components/cards/data/ImageCard.vue';
import useForm from '@/composables/useForm';
+import ProiconsArrowSync from '~icons/proicons/arrow-sync';
import ProIconsPhotoOff from '@/components/icons/ProIconsPhotoOff.vue';
import ProIconsPhoto from '@/components/icons/ProIconsPhoto.vue';
import TablerUpload from '@/components/icons/TablerUpload.vue';
-import IconShare from '@/components/icons/IconShare.vue';
const { pending, addFile, addUrl, removePending, cleanup } = useImageManager();
const props = defineProps<{
images: ImageResource[];
filters?: T[];
- generatableFilters?: { [key: string]: { url: string; text: string; target?: string } };
+ generatableFilters?: { [key: string]: { url: string } };
primaryIds?: Partial<Record<T, number>>;
isAudio?: boolean;
readOnlyTypes?: T[];
@@ -38,10 +39,20 @@ const emit = defineEmits(['handleFinish']);
const mobileUrlInput = useTemplateRef('mobileUrlInput');
const urlInput = ref('');
+const { generate, isGenerating } = usePreviewGenerator();
+
+const generated = reactive<Partial<Record<ImageType, ImageResource>>>({});
+const generateLabel = computed(() => {
+ if (isGenerating.value) return 'Generating…';
+ return `${filteredImages.value.length > 0 ? 'Regenerate' : 'Generate'} ${filteredType.value}`;
+});
+
+const images = computed(() => props.images.filter((i) => !(generated[i.type] && !i.replaced_at)).concat(Object.values(generated) as ImageResource[]));
+
const activeFilters = computed<ImageType[]>(() => props.filters ?? ['poster', 'preview']);
-const filteredImages = computed(() => props.images.filter((i) => i.type === filteredType.value && !i.replaced_at && !deletedImageIds.has(i.id)));
-const replacedImages = computed(() => props.images.filter((i) => i.type === filteredType.value && i.replaced_at));
-const deletedImages = computed(() => props.images.filter((i) => deletedImageIds.has(i.id)));
+const filteredImages = computed(() => images.value.filter((i) => i.type === filteredType.value && !i.replaced_at && !deletedImageIds.has(i.id)));
+const replacedImages = computed(() => images.value.filter((i) => i.type === filteredType.value && i.replaced_at));
+const deletedImages = computed(() => images.value.filter((i) => deletedImageIds.has(i.id)));
const pendingImage = computed(() => pending.value[filteredType.value]);
const filteredImageCount = computed(() => filteredImages.value.length + (pendingImage.value ? 1 : 0));
@@ -99,6 +110,18 @@ const handleSubmit = async () => {
);
};
+const handleGenerate = async () => {
+ const type = filteredType.value;
+ const url = props.generatableFilters?.[type]?.url;
+ if (!url) return;
+
+ const path = await generate(url);
+ if (!path) return;
+
+ const existing = props.images.find((i) => i.type === type && !i.replaced_at);
+ generated[type] = { id: existing?.id ?? -1, source: 'generated', type, path };
+};
+
function buildRequest(fields: ImageFormState<T>): ImageUpdateRequest<T> {
switch (fields.mode) {
case 'existing':
@@ -489,10 +512,10 @@ onUnmounted(() => {
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'"
+ :disabled="isGenerating"
+ @click="handleGenerate"
>
- <IconShare class="size-3.5" /> {{ generatableFilters[filteredType].text }}
+ <ProiconsArrowSync :class="['size-3.5', { 'animate-spin': isGenerating }]" /> {{ generateLabel }}
</ButtonBase>
</template>
</ModalFormFooter>
diff --git a/resources/js/components/modals/EditFolderImagesModal.vue b/resources/js/components/modals/EditFolderImagesModal.vue
index e3406d48..be559b1d 100644
--- a/resources/js/components/modals/EditFolderImagesModal.vue
+++ b/resources/js/components/modals/EditFolderImagesModal.vue
@@ -57,7 +57,7 @@ const invalidateQueries = async () => {
<EditImages
:filters="['poster', 'banner', 'preview']"
:readOnlyTypes="['preview']"
- :generatable-filters="{ preview: { url: `/${modalProps.folderResource.category_id}/${modalProps.folderResource.id}?preview=1`, text: 'Generate preview in new tab' } }"
+ :generatable-filters="{ preview: { url: `/${modalProps.folderResource.category_id}/${modalProps.folderResource.id}` } }"
:images="modalProps.images"
:primary-ids="{ poster: modalProps.resource.poster_image?.id, banner: modalProps.resource.primary_banner_id }"
:is-audio="modalProps.isMajorityAudio"
diff --git a/resources/js/components/modals/EditMediaImagesModal.vue b/resources/js/components/modals/EditMediaImagesModal.vue
index c86b3112..921426a3 100644
--- a/resources/js/components/modals/EditMediaImagesModal.vue
+++ b/resources/js/components/modals/EditMediaImagesModal.vue
@@ -42,8 +42,7 @@ const handleVideoDetailsUpdate = (data: VideoResource) => {
: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',
+ url: `/${modalProps.libraryId}/${modalProps.mediaResource.folder_id}?video=${modalProps.mediaResource.id}`,
},
}"
:images="modalProps.images"