From bb07eb1796329632bc36dd940fc199ed518f5faa Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 8 Mar 2022 17:49:29 +0100 Subject: [PATCH] wait #4876 @0.75 --- .../Admin/Operations/ImportAssetsOperation.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Admin/Operations/ImportAssetsOperation.php b/app/Http/Controllers/Admin/Operations/ImportAssetsOperation.php index 93947e7..412be00 100644 --- a/app/Http/Controllers/Admin/Operations/ImportAssetsOperation.php +++ b/app/Http/Controllers/Admin/Operations/ImportAssetsOperation.php @@ -4,6 +4,8 @@ namespace App\Http\Controllers\Admin\Operations; use App\Models\Asset; +use Cubist\Util\Files\Files; +use Cubist\Util\Str; use Illuminate\Support\Facades\Route; use Prologue\Alerts\Facades\Alert; use Symfony\Component\HttpFoundation\File\UploadedFile; @@ -25,7 +27,6 @@ trait ImportAssetsOperation /** @var UploadedFile[] $files */ $files = request()->files->get('file'); - if (!count($files)) { Alert::warning('Aucun fichier chargé')->flash(); return; @@ -35,13 +36,14 @@ trait ImportAssetsOperation $j = 0; foreach ($files as $i => $file) { - $name = $file->getClientOriginalName(); - $e = explode('.', $name); - $ext = mb_strtolower(array_pop($e)); + $ext = mb_strtolower($file->getClientOriginalExtension()); if (!in_array($ext, $exts)) { continue; } + $name = $file->getClientOriginalName(); $e = explode('-', $name, 2); + + $f = $file->move(sys_get_temp_dir(), Str::slug($file->getBasename('.' . $ext)) . '.' . $ext); $assetId = trim($e[0]); if (!preg_match("/\d+/", $assetId, $matches)) { continue; @@ -51,7 +53,7 @@ trait ImportAssetsOperation if (null === $asset) { continue; } - $asset->replaceMediaInField('file_upload', $file); + $asset->replaceMediaInField('file_upload', $f); $j++; } -- 2.39.5