diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/black-1984277_1280.jpg.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/black-1984277_1280.jpg.txt index db74833..e64f94f 100644 --- a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/black-1984277_1280.jpg.txt +++ b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/black-1984277_1280.jpg.txt @@ -1,8 +1,8 @@ -Description: test +Description: nouvelle description ---- -Tags: DA globale +Tags: ---- @@ -10,7 +10,7 @@ Sort: 7 ---- -Uuid: cWXe3yDs2zcLLiQE +Uuid: PbMGJPIjFYxbbyhq ---- diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/client-brief.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/client-brief.txt index 17d521c..83df18e 100644 --- a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/client-brief.txt +++ b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/client-brief.txt @@ -14,7 +14,10 @@ Description: ---- -Clientbriefimages: - file://cWXe3yDs2zcLLiQE +Clientbriefimages: + +- file://PbMGJPIjFYxbbyhq +- file://STF67mX6eGsLsOGh ---- diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-144546_1280.jpg b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-144546_1280.jpg new file mode 100644 index 0000000..ba16ec9 Binary files /dev/null and b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-144546_1280.jpg differ diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-144546_1280.jpg.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-144546_1280.jpg.txt new file mode 100644 index 0000000..bce4489 --- /dev/null +++ b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-144546_1280.jpg.txt @@ -0,0 +1,17 @@ +Description: test 2 + +---- + +Tags: + +---- + +Sort: 8 + +---- + +Uuid: STF67mX6eGsLsOGh + +---- + +Template: image \ No newline at end of file diff --git a/public/site/config/routes/upload-images.php b/public/site/config/routes/upload-images.php index becb25d..4506d39 100644 --- a/public/site/config/routes/upload-images.php +++ b/public/site/config/routes/upload-images.php @@ -29,17 +29,30 @@ return [ foreach ($data['imageUris'] as $imageUri) { $imageData = json_decode($imageUri, true); - $source = page('materials')->file($imageData['uuid']); + $existingFile = $page->file($imageData['name']); + $source = null; + + if (!$existingFile) { + try { + $source = page('materials')->file($imageData['uuid'])->copy($page); + } catch (\Throwable $th) { + $alerts[$source->name()] = $th->getMessage(); + } + } else { + $allFiles = array_filter($allFiles, function ($uuid) use ($existingFile) { + return $uuid != $existingFile->uuid(); + }); + $source = $existingFile; + } + try { - $copiedFile = $source->copy($page); - $updatedFile = $copiedFile->update([ + $updatedFile = $source->update([ 'description' => $imageData['description'], 'tags' => $imageData['tags'], ]); - - $allFiles[] = (string) $copiedFile->uuid(); - } catch (Exception $e) { - $alerts[$source->name()] = $e->getMessage(); + $allFiles[] = $updatedFile->uuid(); + } catch (\Throwable $th) { + $alert[$source->name()] = $th->getMessage(); } } } @@ -106,8 +119,6 @@ return [ 'clientBriefImages' => $allFiles ]); } - - throw new Exception(json_encode($allFiles), 1); $images = [];