studio-variable/designtopack
4
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity Actions

improve upload images script

Browse source
This commit is contained in:
isUnknown 2024-10-14 15:41:20 +02:00
parent a14f1d210f
commit d197447ad6
3 changed files with 34 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/2527557525_au-commencement-du-college-chloe-avait-donc-fait-la-connaissance-dun-garcon.-il-etait-plus-vieux.pdf
View file

Binary file not shown.

9
public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/2527557525_au-commencement-du-college-chloe-avait-donc-fait-la-connaissance-dun-garcon.-il-etait-plus-vieux.pdf.txt
View file

@ -1,9 +0,0 @@
Date: 2024-10-14 01:15
----
Uuid: xFobejliB3pkAqLr
----
Template: document

42
public/site/config/routes/upload-images.php
View file

@ -5,51 +5,40 @@ return [
'method' => 'POST', 'method' => 'POST',
'action' => function () { 'action' => function () {
throw new Exception(json_encode($_FILES), 1);
$kirby = kirby(); $kirby = kirby();
$request = $kirby->request(); $request = $kirby->request();
$files = $request->files(); $files = $request->files();
$data = $request->data(); $data = $request->data();
throw new Exception(json_encode([
'files' => $files,
'data' => $data,
]));
$pageUri = $request->query()->get('pageUri'); $pageUri = $request->query()->get('pageUri');
$page = page($pageUri); $page = page($pageUri);
if ($uploads = $request->files()) { if ($uploads = $request->files()) {
$existingFiles = $page->files();
$allFiles = $page->clientBriefImages()->toFiles()->pluck('uuid', ','); $allFiles = $page->clientBriefImages()->toFiles()->pluck('uuid', ',');
$alerts = []; $existingFileMap = [];
throw new Exception(json_encode($uploads), 1); foreach ($existingFiles as $file) {
foreach ($uploads->get('images') as $upload) {
// check for duplicate
$files = $page->files();
$duplicates = $files->filter(function ($file) use ($upload) {
// get original safename without prefix
$pos = strpos($file->filename(), '_'); $pos = strpos($file->filename(), '_');
$originalSafename = substr($file->filename(), $pos + 1); $originalSafename = substr($file->filename(), $pos + 1);
$existingFileMap[$originalSafename . '|' . $file->mime() . '|' . $file->size()] = $file->uuid();
}
return $originalSafename === F::safeName($upload['name']) && $alerts = [];
$file->mime() === $upload['type'] && $newFiles = [];
$file->size() === $upload['size'];
});
if ($duplicates->count() > 0) { foreach ($uploads->get('images') as $upload) {
$duplicate = $duplicates->first(); $key = F::safeName($upload['name']) . '|' . $upload['type'] . '|' . $upload['size'];
if (in_array($duplicate->uuid(), $allFiles)) { if (isset($existingFileMap[$key])) {
$allFiles[] = $duplicate->uuid(); $duplicateUUID = $existingFileMap[$key];
if (!in_array($duplicateUUID, $allFiles)) {
$allFiles[] = $duplicateUUID;
$alerts[$upload['name']] = "The file already exists, added to the field."; $alerts[$upload['name']] = "The file already exists, added to the field.";
} }
} } else {
try { try {
$name = crc32($upload['name'] . microtime()) . '_' . $upload['name']; $name = crc32($upload['name'] . microtime()) . '_' . $upload['name'];
$newFile = $page->createFile([ $newFile = $page->createFile([
@ -57,7 +46,7 @@ return [
'filename' => $name, 'filename' => $name,
'template' => 'image', 'template' => 'image',
'content' => [ 'content' => [
'date' => date('Y-m-d h:m') 'date' => date('Y-m-d H:i:s')
] ]
]); ]);
@ -70,6 +59,7 @@ return [
$alerts[$upload['name']] = $e->getMessage(); $alerts[$upload['name']] = $e->getMessage();
} }
} }
}
$newPage = $page->update([ $newPage = $page->update([
'clientBriefImages' => $allFiles 'clientBriefImages' => $allFiles