A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: delete images capability on metadata image api
aminnausin609b5ba6d6ca
diff --git a/app/Http/Controllers/Api/V1/MetadataController.php b/app/Http/Controllers/Api/V1/MetadataController.phpindex 110e271a..3b5de18c 100644--- a/app/Http/Controllers/Api/V1/MetadataController.php+++ b/app/Http/Controllers/Api/V1/MetadataController.php@@ -2,6 +2,7 @@namespace App\Http\Controllers\Api\V1;+use App\Data\Images\ImageUpdateData;use App\Enums\ImageType;use App\Http\Controllers\Controller;use App\Http\Requests\LyricsUpdateRequest;@@ -20,14 +21,15 @@ use App\Traits\HttpResponses;use App\Traits\LogsModelChanges;use Illuminate\Database\Eloquent\ModelNotFoundException;use Illuminate\Support\Facades\Auth;+use Illuminate\Support\Facades\Gate;class MetadataController extends Controller {use HasTags;use HttpResponses;use LogsModelChanges;- public function show($id) {- $metadata = Metadata::with(['videoTags.tag'])->findOrFail($id);+ public function show(Metadata $metadata) {+ $metadata->load(['videoTags.tag']);return response()->json(new MetadataResource($metadata));}@@ -100,54 +102,32 @@ class MetadataController extends Controller {}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,- };+ $this->authorize('editor');++ $user = Auth::user();- if ($mode !== 'remove' && ! $image) {+ $imageUpdateData = ImageUpdateData::fromRequest($request, $user, Gate::allows('admin'));+ $image = $imageService->resolveUpdatedImage($metadata, $imageUpdateData);++ if ($imageUpdateData->mode !== 'remove' && ! $image) {abort(422, 'Image could not be resolved.');}- match ($imageType) {+ match ($imageUpdateData->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();}+ $imageService->softDeleteImages($metadata, $imageUpdateData);$metadata->refresh();- $video = Video::findOrFail($metadata->video_id);- return response()->json(new VideoResource($this->eagerLoadVideo($video, $metadata)));+ return response()->json(new VideoResource($this->eagerLoadVideo(Video::findOrFail($metadata->video_id), $metadata)));}private function eagerLoadVideo(Video $video, Metadata $metadata): Video {