A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: media image editor
aminnausin2355d19e6a30
diff --git a/app/Http/Controllers/Api/V1/MetadataController.php b/app/Http/Controllers/Api/V1/MetadataController.phpindex 415b2a63..110e271a 100644--- a/app/Http/Controllers/Api/V1/MetadataController.php+++ b/app/Http/Controllers/Api/V1/MetadataController.php@@ -2,8 +2,10 @@namespace App\Http\Controllers\Api\V1;+use App\Enums\ImageType;use App\Http\Controllers\Controller;use App\Http\Requests\LyricsUpdateRequest;+use App\Http\Requests\Media\MediaImageUpdateRequest;use App\Http\Requests\MetadataStoreRequest;use App\Http\Requests\MetadataUpdateRequest;use App\Http\Resources\MetadataResource;@@ -12,6 +14,7 @@ use App\Models\Metadata;use App\Models\Subtitle;use App\Models\Video;use App\Models\VideoTag;+use App\Services\Images\ImageService;use App\Traits\HasTags;use App\Traits\HttpResponses;use App\Traits\LogsModelChanges;@@ -96,6 +99,57 @@ class MetadataController extends Controller {return response()->json(new VideoResource($this->eagerLoadVideo($video, $metadata)));}+ public function updateImages(MediaImageUpdateRequest $request, Metadata $metadata, ImageService $imageService) {+ $this->authorize('admin');++ $imageType = ImageType::from($request->validated('type'));+ $mode = $request->validated('mode');+ $userId = Auth::id();++ $image = match ($mode) {+ 'existing' => $metadata->images()->where('id', $request->validated('image_id'))->where('image_type', $imageType)->firstOrFail(),++ 'upload' => $imageService->uploadImage(+ $request->file('image'),+ $metadata,+ $imageType,+ $userId+ ),++ 'url' => $imageService->downloadFromUrl(+ $request->validated('url'),+ $metadata,+ $imageType,+ $userId+ ),++ 'remove' => null,+ };++ if ($mode !== 'remove' && ! $image) {+ abort(422, 'Image could not be resolved.');+ }++ match ($imageType) {+ ImageType::POSTER => $metadata->primary_poster_id = $image?->id,+ default => null,+ };++ if ($metadata->isDirty()) {+ $user = Auth::user();+ $metadata->fill(['editor_id' => $user->id, 'edited_at' => now()]);++ $this->logModelChanges($metadata, ['request' => ['type' => 'update images', ...$request->validated()]], $user);++ $metadata->save();+ }++ $metadata->refresh();+ $video = Video::findOrFail($metadata->video_id);++ return response()->json(new VideoResource($this->eagerLoadVideo($video, $metadata)));+ }+private function eagerLoadVideo(Video $video, Metadata $metadata): Video {$metadata->load(['subtitles' => function ($q) {diff --git a/app/Http/Requests/Media/MediaImageUpdateRequest.php b/app/Http/Requests/Media/MediaImageUpdateRequest.phpnew file mode 100644index 00000000..bf890bf9--- /dev/null+++ b/app/Http/Requests/Media/MediaImageUpdateRequest.php@@ -0,0 +1,31 @@+<?php++namespace App\Http\Requests\Media;++use App\Models\Metadata;+use App\Rules\ImageUpdateRules;+use Illuminate\Foundation\Http\FormRequest;+use Illuminate\Support\Facades\Gate;+use Illuminate\Validation\Rule;++class MediaImageUpdateRequest extends FormRequest {+ /**+ * Determine if the user is authorized to make this request.+ */+ public function authorize(): bool {+ return Gate::allows('admin');+ }++ /**+ * Get the validation rules that apply to the request.+ *+ * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>+ */+ public function rules(): array {+ return [+ 'type' => ['required', Rule::in(Metadata::getEditableImageTypes())],+ 'mode' => ['required', Rule::in(['existing', 'upload', 'url', 'remove'])],+ ...ImageUpdateRules::base(),+ ];+ }+}diff --git a/app/Models/Metadata.php b/app/Models/Metadata.phpindex 2f97a22e..579faea7 100644--- a/app/Models/Metadata.php+++ b/app/Models/Metadata.php@@ -2,6 +2,7 @@namespace App\Models;+use App\Enums\ImageType;use App\Enums\MediaType;use App\Traits\HasEditableFields;use Illuminate\Database\Eloquent\Factories\HasFactory;@@ -199,6 +200,12 @@ class Metadata extends Model {];}+ public static function getEditableImageTypes(): array {+ return [+ ImageType::POSTER->value,+ ];+ }+/*** Builds the ideal directory for a given metadata item*diff --git a/app/Rules/ImageUpdateRules.php b/app/Rules/ImageUpdateRules.phpnew file mode 100644index 00000000..6b3158b6--- /dev/null+++ b/app/Rules/ImageUpdateRules.php@@ -0,0 +1,32 @@+<?php++namespace App\Rules;++class ImageUpdateRules {+ public static function base(): array {+ return [+ 'image_id' => [+ 'required_if:mode,existing',+ 'integer',+ 'exists:images,id',+ ],++ 'image' => [+ 'required_if:mode,upload',+ 'file',+ 'image',+ 'mimes:' . implode(',', config('media.uploads.allowed_extentions', ['jpeg', 'jpg', 'png', 'webp'])),+ 'max:' . config('media.uploads.max_upload_size', 10240),+ ],++ 'url' => [+ 'required_if:mode,url',+ 'url',+ 'max:2048',+ ],++ 'deleted_images' => ['nullable', 'array'],+ 'deleted_images.*' => ['integer'],+ ];+ }+}diff --git a/app/Services/Images/ImageService.php b/app/Services/Images/ImageService.phpindex b26de588..8c6a7b91 100644--- a/app/Services/Images/ImageService.php+++ b/app/Services/Images/ImageService.php@@ -12,6 +12,7 @@ use App\Models\Series;use Bepsvpt\Blurhash\Facades\BlurHash;use Illuminate\Contracts\Filesystem\FileNotFoundException;use Illuminate\Database\Eloquent\Model;+use Illuminate\Http\UploadedFile;use Illuminate\Support\Facades\Http;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Storage;@@ -190,6 +191,61 @@ class ImageService {}}+ /**+ * Upload image file to disk and save to db+ *+ * Only accepts jpeg, png and webp mime types+ *+ * @return Image persisted image data from disk+ */+ public function uploadImage(UploadedFile $file, Model $owner, ImageType $imageType, int $userId): ?Image {+ $debugInfo = ['owner' => $owner::class, 'id' => $owner->id, 'uuid' => $owner->uuid ?? $owner->getKey(), 'image_type' => $imageType->value];++ try {+ if (! $file->isValid()) {+ Log::warning(+ 'Uploaded image invalid',+ $debugInfo+ );++ return null;+ }++ $fmt = match ($file->getMimeType()) {+ 'image/jpeg' => 'jpg',+ 'image/png' => 'png',+ 'image/webp' => 'webp',+ default => throw new \InvalidArgumentException("Unsupported image format: {$file->getMimeType()}"),+ };++ [$relativeOutputPath, $absoluteOutputPath] = $this->resolvePath($owner, $imageType, $fmt, null, true);++ Storage::disk('public')->putFileAs(dirname($relativeOutputPath), $file, basename($relativeOutputPath));++ if (! file_exists($absoluteOutputPath) || filesize($absoluteOutputPath) === 0) {+ Log::warning('Failed to upload image, file missing', [...$debugInfo, 'outputPath' => $absoluteOutputPath]);++ return null;+ }++ return $this->persistImage(+ $owner,+ new ImageData(+ absolutePath: $absoluteOutputPath,+ relativePath: $relativeOutputPath,+ type: $imageType,+ source: ImageSource::UPLOADED,+ format: $fmt,+ userId: $userId,+ )+ );+ } catch (\Throwable $th) {+ Log::warning('Failed to upload image', [...$debugInfo, 'error' => $th->getMessage()]);++ return null;+ }+ }+// Untested// Dangerouspublic function migrateImage(string $filePath, Model $owner, ImageType $imageType, ?int $userId = null): ?Image {diff --git a/config/media.php b/config/media.phpindex 4715ca45..e756f37e 100644--- a/config/media.php+++ b/config/media.php@@ -20,4 +20,8 @@ return ['opus' => 'opus','flac' => 'flac',],+ 'uploads' => [+ 'allowed_extentions' => ['jpeg', 'jpg', 'png', 'webp'],+ 'max_upload_size' => 1024 * 10,+ ],];diff --git a/resources/js/components/cards/data/ImageCard.vue b/resources/js/components/cards/data/ImageCard.vuenew file mode 100644index 00000000..d7f44696--- /dev/null+++ b/resources/js/components/cards/data/ImageCard.vue@@ -0,0 +1,144 @@+<script setup lang="ts">+import type { HTMLAttributes } from 'vue';+import type { ImageResource } from '@/contracts/media';++import { CedarDelete2 } from '@/components/cedar-ui/icons';+import { ButtonIcon } from '@/components/cedar-ui/button';+import { computed } from 'vue';+import { cn } from '@aminnausin/cedar-ui';++import VideoControlWrapper from '@/components/video/VideoControlWrapper.vue';++import LazyImage from '@/components/lazy/LazyImage.vue';+import MediaTag from '@/components/labels/MediaTag.vue';++import ProiconsDelete from '~icons/proicons/delete';+import PrimeSave from '~icons/prime/save';++const props = withDefaults(defineProps<{ data: ImageResource; isPrimary?: boolean; isActive?: boolean; isAudio?: boolean }>(), {+ isPrimary: false,+ isActive: false,+ isAudio: false,+});++const filename = computed(() => props.data.path.split('/').at(-1));+const tags = computed(() => [props.data.type, props.data.source]);++const generatePosterStyle = (url?: string): HTMLAttributes['style'] => {+ if (!url) return {};++ // I could use blur hash instead+ return {+ backgroundImage: `url("${url}")`,+ backgroundPosition: 'center',+ backgroundSize: 'cover',+ backgroundRepeat: 'no-repeat',+ };+};++const emit = defineEmits({+ select: () => true,+ deselect: () => true,+ delete: () => true,+});+</script>+<template>+ <div+ :class="[+ 'relative flex flex-wrap items-center justify-between',+ 'w-full rounded-lg text-sm shadow-sm transition',+ 'data-card',+ `ring-2 ${isPrimary ? 'ring-primary-active/60' : 'ring-transparent dark:ring-neutral-700/20'}`,+ ]"+ >+ <div :class="cn('relative flex max-h-48 w-full items-center overflow-clip rounded-t-lg text-xs select-none sm:max-h-80')">+ <div :class="cn({ 'aspect-[1.91/1]!': data.type === 'preview', 'aspect-square': isAudio, 'aspect-video': !isAudio }, 'size-full', $attrs.class)">+ <div class="absolute inset-0 scale-120 blur-sm" :style="generatePosterStyle(data.path)"></div>++ <LazyImage+ :src="data.path"+ alt="poster"+ :animate="false"+ loading="lazy"+ :wrapper-class="cn('transition-opacity duration-input')"+ :class="cn('absolute inset-0 size-full object-contain', { 'aspect-[1.91/1]': data.type === 'preview' })"+ />+ </div>++ <!-- Overlay -->+ <div :class="cn('duration-input pointer-events-none absolute inset-0 z-3 flex items-start justify-between gap-1 p-2 transition-[translate,margin]')">+ <div class="h-fit">+ <VideoControlWrapper :class="cn('w-fit transition-opacity duration-150')" v-if="isPrimary">+ <p :class="cn('font-figtree px-1 text-white tabular-nums text-shadow-lg')">Primary</p>+ </VideoControlWrapper>+ </div>+ <div class="text-foreground-i dark:text-foreground-0 pointer-events-auto flex gap-1" v-if="data.type !== 'preview'">+ <ButtonIcon+ class="overlay-button hover:ring-1"+ :type="'button'"+ :variant="'ghost'"+ :title="isPrimary ? 'Already Selected' : 'Select'"+ :disabled="isPrimary"+ v-if="!isPrimary"+ @click="$emit('select')"+ >+ <template #icon>+ <PrimeSave class="size-4" />+ </template>+ </ButtonIcon>+ <ButtonIcon v-else class="overlay-button hover:ring-1" :type="'button'" title="Remove Selection" :variant="'ghost'" @click="$emit('deselect')">+ <template #icon>+ <CedarDelete2 class="size-4" />+ </template>+ </ButtonIcon>+ <ButtonIcon+ v-if="!data.blurHash || data.source !== 'generated'"+ class="overlay-button hover:ring-1"+ :type="'button'"+ title="Delete"+ :variant="'ghost'"+ @click="$emit('delete')"+ >+ <template #icon>+ <ProiconsDelete class="size-4" />+ </template>+ </ButtonIcon>+ </div>+ </div>+ </div>+ <div class="text-foreground-1 flex w-full flex-col items-start justify-between gap-x-4 gap-y-2 p-3 dark:text-inherit">+ <p class="w-full truncate" :title="filename">{{ filename }}</p>+ <span class="-ms-0.5 flex w-full flex-wrap gap-1 overflow-clip text-xs [overflow-clip-margin:4px]">+ <MediaTag+ v-for="(tag, index) in tags"+ :key="index"+ :label="tag"+ :class="+ cn(+ 'text-xs',+ 'hover:bg-primary dark:hover:bg-primary/90 hover:text-foreground-i text-foreground-7 bg-neutral-200 leading-none shadow-sm dark:bg-neutral-900',+ )+ "+ />+ </span>+ </div>+ </div>+</template>+<style scoped lang="css">+.overlay-button {+ --tw-ring-color: var(--color-primary) /* var(--color-purple-600) */;++ width: calc(var(--spacing) * 6) /* 1.5rem = 24px */;+ height: calc(var(--spacing) * 6) /* 1.5rem = 24px */;+ padding: calc(var(--spacing) * 1) /* 0.25rem = 4px */;+ background-color: color-mix(in oklab, var(--color-neutral-900) /* oklch(20.5% 0 0) = #171717 */ 40%, transparent);++ transition-property: text-decoration-color, background-color, box-shadow;++ &:hover {+ @media (hover: hover) {+ background-color: color-mix(in oklab, var(--color-neutral-900) /* oklch(20.5% 0 0) = #171717 */ 60%, transparent);+ }+ }+}+</style>diff --git a/resources/js/components/cedar-ui/input/InputShell.vue b/resources/js/components/cedar-ui/input/InputShell.vueindex 169d7f29..7a149f21 100644--- a/resources/js/components/cedar-ui/input/InputShell.vue+++ b/resources/js/components/cedar-ui/input/InputShell.vue@@ -15,7 +15,7 @@ const props = withDefaults(defineProps<InputShellProps>(), { clampText: true });'scrollable-input scrollbar-minimal','transition-input ease-in-out focus:outline-hidden','bg-surface-2 placeholder:text-foreground-3 dark:placeholder:text-foreground-2 dark:bg-neutral-700',- 'hocus:ring-2 hover:ring-primary-muted focus-visible:ring-primary',+ 'hocus:ring-2 hover:ring-primary-muted dark:hover:ring-primary-muted focus-visible:ring-primary',{ 'line-clamp-1 text-ellipsis whitespace-nowrap': clampText },'disabled:button-disabled','block w-full border-none',diff --git a/resources/js/components/forms/EditImages.vue b/resources/js/components/forms/EditImages.vuenew file mode 100644index 00000000..2b24ef94--- /dev/null+++ b/resources/js/components/forms/EditImages.vue@@ -0,0 +1,275 @@+<script setup lang="ts">+import type { ImageResource, ImageType, MetadataResource } from '@/types/resources';+import type { MediaImageFormState, MediaImageType, MediaImageUpdateRequest } from '@/types/imageRequests';++import { computed, onMounted, onUnmounted, ref, watch } from 'vue';+import { ButtonForm, ButtonText } from '@/components/cedar-ui/button';+import { updateMediaImage } from '@/service/mediaAPI.ts';+import { useImageManager } from '@/composables/editor/useImageManager';+import { TextInput } from '@/components/cedar-ui/input';+import { MediaType } from '@/types/types';+import { cn, toast } from '@aminnausin/cedar-ui';++import ProIconsPhotoOff from '@/components/icons/ProIconsPhotoOff.vue';+import TablerUpload from '@/components/icons/TablerUpload.vue';+import ImageCard from '@/components/cards/data/ImageCard.vue';+import useForm from '@/composables/useForm';++const filters: ImageType[] = ['poster', 'preview'];++const { pending, addFile, addUrl, removePending, cleanup } = useImageManager();++const props = defineProps<{ media: MetadataResource; images: ImageResource[] }>();+const emit = defineEmits(['handleFinish']);++const filteredType = ref<ImageType>('poster');+const urlInput = ref('');++const deletedImages = ref<Set<number>>(new Set());++const filteredImages = computed(() => props.images.filter((i) => i.type === filteredType.value && !deletedImages.value.has(i.id)));+const pendingImage = computed(() => pending.value[filteredType.value]);+const isAudio = computed(() => props.media.media_type === MediaType.AUDIO);++const form = useForm<MediaImageUpdateRequest>({+ type: 'poster',+ mode: 'existing',+ image_id: props.media.poster_image?.id ?? null,+});++const resetForm = () => {+ form.reset('type', 'mode', 'image_id');+ deletedImages.value.clear();+ cleanup();+};++const handleSubmit = async () => {+ form.submit(+ async (fields) => {+ const request = buildRequest(fields);+ const formData = new FormData();++ formData.append('type', fields.type);+ formData.append('mode', fields.mode);++ if (request.mode === 'existing') formData.append('image_id', String(request.image_id));+ if (request.mode === 'upload') formData.append('image', request.file);+ if (request.mode === 'url') formData.append('url', request.url);+ return updateMediaImage(props.media.id, formData);+ },+ {+ onSuccess: (response) => {+ emit('handleFinish', response?.data);+ toast.add('Success', { type: 'success', description: 'Edit submitted!' });+ },+ onError: () => {+ toast.add('Error', { type: 'danger', description: 'Unable to update media images.' });+ },+ },+ );+};++function buildRequest(fields: MediaImageFormState): MediaImageUpdateRequest {+ switch (fields.mode) {+ case 'existing':+ return { mode: 'existing', type: fields.type, image_id: fields.image_id as number };+ case 'upload':+ return { mode: 'upload', type: fields.type, file: fields.file as File };+ case 'url':+ return { mode: 'url', type: fields.type, url: fields.url as string };+ case 'remove':+ return { mode: 'remove', type: fields.type };+ }+}++function handleFileInput(e: Event) {+ handleUploadFile((e.target as HTMLInputElement).files?.[0]);+}++function handleDrop(e: DragEvent) {+ e.preventDefault();+ handleUploadFile(e.dataTransfer?.files[0]);+}++function handlePaste(e: ClipboardEvent) {+ if (filteredType.value === 'preview') return;++ const target = e.target as HTMLElement;++ if (target.tagName === 'INPUT' || target.tagName === 'TEXTAREA') return;++ e.preventDefault();+ handleUploadFile(e.clipboardData?.files.item(0));+}++function handleUploadFile(file?: File | null) {+ if (!file?.type.startsWith('image/')) return;++ form.fields.image_id = addFile(file, filteredType.value).tempId;+ form.fields.mode = 'upload';+ form.fields.file = file;+}++function handleUrlFetch() {+ const url = urlInput.value.trim();+ if (!url) return;++ form.fields.image_id = addUrl(url, filteredType.value).tempId;+ form.fields.url = url;+ form.fields.mode = 'url';+ urlInput.value = '';+}++function handleSelect(id: number | string | null) {+ form.fields.image_id = id;+ if (id === null) form.fields.mode = 'remove';+ else if (typeof id === 'number') form.fields.mode = 'existing';+ form.fields.mode = typeof id === 'string' ? form.fields.mode : 'existing';+}++function handleDelete(id: number) {+ // unimplemented+ // deletedImages.value.add(id);+ // if (filteredPrimaryId(filteredType.value) === id) handleSelect(null);+}++/**+ * Gets the primary id corresponding to a given type from the provided metadata+ * @param type ImageType -> Only supports `poster` for `metadata`+ */+const filteredPrimaryId = (type: ImageType): number | null => {+ switch (type) {+ case 'poster':+ return props.media.poster_image?.id ?? null;+ default:+ return null;+ }+};++// Resets to the default primary id when type is changed+watch(filteredType, (type) => {+ form.fields.type = type as MediaImageType;+ form.fields.mode = 'existing';+ form.fields.image_id = filteredPrimaryId(type);+});++onMounted(() => document.addEventListener('paste', handlePaste));+onUnmounted(() => {+ document.removeEventListener('paste', handlePaste);+ cleanup();+});+</script>++<template>+ <div class="flex flex-wrap gap-2">+ <ButtonText+ class="h-8 rounded-lg px-3 py-0.5 text-sm"+ v-for="filter in filters"+ :key="filter"+ @click="filteredType = filter"+ :class="cn('hocus:ring-1 dark:bg-white/5', { 'bg-surface-i! text-foreground-i!': filter === filteredType })"+ >+ {{ filter }}+ </ButtonText>+ </div>+ <form class="flex flex-col flex-wrap gap-4 text-sm sm:flex-row sm:justify-between" @submit.prevent="handleSubmit">+ <div+ class="group hover:border-primary-muted/60 hover:bg-primary-muted/5 border-foreground-0/15 text-foreground-2 relative w-full rounded-xl border-2 border-dashed p-3 text-center transition"+ v-if="filteredType !== 'preview'"+ >+ <input type="file" accept="image/*" class="absolute inset-0 h-full w-full cursor-pointer opacity-0" @input="handleFileInput" @drop="handleDrop" />++ <TablerUpload class="group-hover:text-foreground-1 dark:text-foreground-3 dark:group-hover:text-foreground-1 mx-auto mb-2 size-6 transition" />++ <p class="text-foreground-1 dark:text-foreground-0 font-medium">Paste, drag, or click to upload</p>+ <p>jpg, jpeg, png, webp · max 10 MB</p>++ <div class="relative z-1 mt-3 flex gap-2" onclick="event.stopPropagation()">+ <TextInput+ type="url"+ v-model="urlInput"+ placeholder="Or enter a URL to download…"+ :class="'hocus:ring-1 focus:ring-primary-muted/60! focus:placeholder:text-foreground-2 text-foreground-0 h-full dark:bg-white/6 dark:ring-white/10 dark:not-focus:placeholder:text-white/30'"+ />++ <ButtonText+ :type="'button'"+ :class="+ cn('hocus:ring-1 h-full px-3 dark:bg-white/6 dark:not-focus:not-hover:ring-white/10 dark:hover:bg-white/10', {+ 'text-foreground-0': urlInput.length > 0,+ })+ "+ @click="handleUrlFetch"+ :disabled="!urlInput"+ >+ Fetch+ </ButtonText>+ </div>+ </div>++ <div class="w-full space-y-2" v-if="filteredImages.length + (pendingImage ? 1 : 0) !== 0">+ <div class="text-foreground-2 flex w-full items-center justify-between gap-2 text-xs">+ <p class="uppercase">current</p>+ <p>{{ filteredImages.length + (pendingImage ? 1 : 0) }} images</p>+ </div>+ <div :class="['grid w-full grid-cols-1 gap-2', { 'sm:grid-cols-2': filteredImages.length + (pendingImage ? 1 : 0) > 1 }]">+ <ImageCard+ v-if="pendingImage"+ :data="{+ id: -1,+ type: pendingImage.type,+ path: pendingImage.previewUrl,+ source: pendingImage.sourceUrl ? 'url' : 'uploaded',+ }"+ :is-primary="form.fields.image_id === pendingImage.tempId"+ :is-audio="isAudio"+ @select="handleSelect(pendingImage.tempId)"+ @deselect="handleSelect(null)"+ @delete="+ handleSelect(media.poster_image?.id ?? null);+ removePending(pendingImage.type);+ "+ />++ <ImageCard+ v-for="image in filteredImages"+ :key="image.id"+ :data="image"+ :is-primary="image.id == form.fields.image_id"+ :is-audio="isAudio"+ @select="handleSelect(image.id)"+ @deselect="handleSelect(null)"+ @delete="handleDelete(image.id)"+ />+ </div>+ </div>+ <div v-else class="text-foreground-1 flex w-full items-center justify-center gap-1 py-8 tracking-widest">+ <ProIconsPhotoOff class="size-6" /> <span> No images available </span>+ </div>++ <div :class="['text-danger-2 w-full text-center dark:text-rose-400']" v-if="form.dirty">+ <p v-if="form.fields.image_id === null">Deleting Poster Image!</p>+ <p v-else-if="form.fields.image_id !== media.poster_image?.id">Replacing Poster Image!</p>+ <p v-if="deletedImages.size">Deleting {{ deletedImages.size }} images from disk!</p>+ </div>+ <div class="relative mt-2 flex w-full flex-col-reverse gap-2 sm:flex-row sm:justify-end" v-if="filteredType !== 'preview'">+ <ButtonForm @click="$emit('handleFinish')" variant="reset" :disabled="false"> Cancel </ButtonForm>+ <ButtonForm+ variant="danger"+ :class="+ cn('transition-reveal h-9 overflow-hidden', {+ 'h-9 py-2 opacity-100': form.dirty,+ '-mt-2 h-0 py-0 opacity-0 sm:mt-0 sm:h-9 sm:py-2': !form.dirty,+ 'sm:mx-0 sm:w-18': form.dirty,+ 'w-full sm:-mx-1 sm:w-0 sm:px-0': !form.dirty,+ })+ "+ :disabled="false"+ @click="resetForm"+ >+ Reset+ </ButtonForm>+ <ButtonForm @click="handleSubmit" variant="submit" :disabled="false" class="h-9"> Save </ButtonForm>+ </div>+ </form>+</template>diff --git a/resources/js/composables/editor/useImageManager.ts b/resources/js/composables/editor/useImageManager.tsnew file mode 100644index 00000000..96fcf7eb--- /dev/null+++ b/resources/js/composables/editor/useImageManager.ts@@ -0,0 +1,69 @@+import type { ImageType } from '@/types/resources';++import { ref } from 'vue';++export interface PendingImage {+ tempId: string;+ file?: File;+ previewUrl: string;+ sourceUrl?: string;+ type: ImageType;+}++export function useImageManager() {+ const pending = ref<Partial<Record<ImageType, PendingImage>>>({});++ function addFile(file: File, type: ImageType): PendingImage {+ clearPendingEntry(type);++ const entry: PendingImage = {+ tempId: createTempId(),+ file,+ previewUrl: URL.createObjectURL(file),+ type,+ };++ pending.value = { ...pending.value, [type]: entry };+ return entry;+ }++ function addUrl(url: string, type: ImageType): PendingImage {+ clearPendingEntry(type);++ const entry: PendingImage = {+ tempId: createTempId(),+ sourceUrl: url,+ previewUrl: url,+ type,+ };++ pending.value = { ...pending.value, [type]: entry };+ return entry;+ }++ function removePending(type: ImageType) {+ clearPendingEntry(type);++ const next = { ...pending.value };+ delete next[type];+ pending.value = next;+ }++ function cleanup() {+ Object.values(pending.value).forEach((i) => {+ if (i?.file) URL.revokeObjectURL(i.previewUrl);+ });+ pending.value = {};+ }++ const clearPendingEntry = (type: ImageType) => {+ const entry = pending.value[type];++ if (entry?.file) URL.revokeObjectURL(entry.previewUrl);+ };++ // replaces crypto.randomUUID+ const createTempId = () => `${Date.now()}-${Math.random().toString(36).slice(2, 9)}`;++ return { pending, addFile, addUrl, removePending, cleanup };+}diff --git a/resources/js/service/mediaAPI.ts b/resources/js/service/mediaAPI.tsindex afcec9a2..ed625176 100644--- a/resources/js/service/mediaAPI.ts+++ b/resources/js/service/mediaAPI.ts@@ -83,3 +83,15 @@ export function updateLibrarySettings(id: number, data: { is_private?: boolean;export function updateLibraryDefaultFolder(id: number, data: { default_folder_id: number }) {return API.patch(`/categories/${id}/default-folder`, data);}++export function updateMediaImage(id: number, data: FormData) {+ return API.patch(`/metadata/${id}/images`, data, {+ headers: { 'Content-Type': 'multipart/form-data' },+ });+}++export function updateSeriesImage(id: number, data: FormData) {+ return API.patch(`/series/${id}/images`, data, {+ headers: { 'Content-Type': 'multipart/form-data' },+ });+}diff --git a/resources/js/types/imageRequests.ts b/resources/js/types/imageRequests.tsnew file mode 100644index 00000000..2c021dc9--- /dev/null+++ b/resources/js/types/imageRequests.ts@@ -0,0 +1,42 @@+export type MediaImageType = 'poster';+export type SeriesImageType = 'poster' | 'banner';+export type UserImageType = 'avatar' | 'banner';++export type ImageUpdateType = 'existing' | 'upload' | 'url' | 'remove';++type ImageUpdateRequest<T extends string> =+ | {+ mode: 'existing';+ type: T;+ image_id: number | null;+ }+ | {+ mode: 'upload';+ type: T;+ file: File;+ }+ | {+ mode: 'url';+ type: T;+ url: string;+ }+ | {+ mode: 'remove';+ type: T;+ };++export interface ImageFormState<T extends string> {+ type: T;+ mode: ImageUpdateType;+ image_id?: number | string | null;+ file?: File;+ url?: string;+}++export type MediaImageUpdateRequest = ImageUpdateRequest<MediaImageType>;+export type SeriesImageUpdateRequest = ImageUpdateRequest<SeriesImageType>;+export type UserImageUpdateRequest = ImageUpdateRequest<SeriesImageType>;++export type MediaImageFormState = ImageFormState<MediaImageType>;+export type SeriesImageFormState = ImageFormState<SeriesImageType>;+export type UserImageFormState = ImageFormState<UserImageType>;diff --git a/routes/api.php b/routes/api.phpindex 9aeb1d7a..36d31e16 100755--- a/routes/api.php+++ b/routes/api.php@@ -87,6 +87,8 @@ Route::group(['middleware' => ['auth:sanctum']], function () {// StoryboardRoute::get('/storyboard', [StoryboardController::class, 'show']);Route::post('/storyboard', [StoryboardController::class, 'regenerate']); // clear existing files and queue regenerate+ // Images+ Route::patch('/images', [MetadataController::class, 'updateImages']);});Route::prefix('/categories/{category}')->group(function () {