From eed9ac8ff4a55ac4bad6a1cd5b2e5fe4a9426c86 Mon Sep 17 00:00:00 2001 From: James Collins Date: Tue, 29 Aug 2023 15:51:55 +1000 Subject: [PATCH] bugfix --- app/Http/Controllers/Api/MediaController.php | 25 ++++++++++++++------ app/Http/Requests/MediaRequest.php | 6 +++++ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Api/MediaController.php b/app/Http/Controllers/Api/MediaController.php index 277b945..c04631f 100644 --- a/app/Http/Controllers/Api/MediaController.php +++ b/app/Http/Controllers/Api/MediaController.php @@ -91,13 +91,23 @@ class MediaController extends ApiController } if($request->has('chunk') === false || $request->get('chunk') === '1') { - $request->merge([ - 'title' => $request->get('title', ''), - 'name' => $file->getClientOriginalName(), - 'size' => $file->getSize(), - 'mime_type' => $file->getMimeType(), - 'status' => 'Processing Media', - ]); + if($request->has('chunk')) { + $request->merge([ + 'title' => $request->get('title', ''), + 'name' => $request->get('name'), + 'size' => 0, + 'mime_type' => '', + 'status' => 'Processing Media', + ]); + } else { + $request->merge([ + 'title' => $request->get('title', ''), + 'name' => $file->getClientOriginalName(), + 'size' => $file->getSize(), + 'mime_type' => $file->getMimeType(), + 'status' => 'Processing Media', + ]); + } // We store images by default locally if ($request->get('storage') === null) { @@ -114,6 +124,7 @@ class MediaController extends ApiController $mediaItem = $request->user()->media()->create($request->except(['file','transform'])); + Log::info($file->getClientOriginalName()); Log::info($mediaItem->name); Log::info(pathinfo($mediaItem->name, PATHINFO_EXTENSION)); diff --git a/app/Http/Requests/MediaRequest.php b/app/Http/Requests/MediaRequest.php index abef822..35f47b8 100644 --- a/app/Http/Requests/MediaRequest.php +++ b/app/Http/Requests/MediaRequest.php @@ -15,6 +15,12 @@ class MediaRequest extends BaseRequest }), 'string', ], + 'name' => [ + Rule::requiredIf(function () { + return request()->has('chunk') && request('chunk') == 1; + }), + 'string', + ], 'chunk' => 'required_with:chunk_count|integer|min:1|max:99', 'chunk_count' => 'required_with:chunk|integer|min:1', ];