.

atrocore · Jul 13, 2023 · bae44b8 · bae44b8
1 parent 9ed1cd8
commit bae44b8
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 1 deletion.
diff --git a/app/Resources/i18n/de_DE/Settings.json b/app/Resources/i18n/de_DE/Settings.json
@@ -1,5 +1,6 @@
 {
   "fields": {
+    "attachmentDuplicates": "Asset-Duplikat",
     "fileNameRegexPattern": "Dateiname Regex Pattern"
   },
   "tooltips": {

diff --git a/app/Resources/i18n/en_US/Settings.json b/app/Resources/i18n/en_US/Settings.json
@@ -1,5 +1,6 @@
 {
   "fields": {
+    "attachmentDuplicates": "Asset Duplicates",
     "fileNameRegexPattern": "Filename Regex Pattern"
   },
   "tooltips": {

diff --git a/app/Resources/i18n/ru_RU/Settings.json b/app/Resources/i18n/ru_RU/Settings.json
@@ -1,5 +1,6 @@
 {
   "fields": {
+    "attachmentDuplicates": "Дубликаты ресурсов",
     "fileNameRegexPattern": "Шаблон для имени файла"
   },
   "tooltips": {

diff --git a/app/Resources/i18n/uk_UA/Settings.json b/app/Resources/i18n/uk_UA/Settings.json
@@ -1,5 +1,6 @@
 {
   "fields": {
+    "attachmentDuplicates": "Дублікати ресурсів",
     "fileNameRegexPattern": "Шаблон для імені файлу"
   },
   "tooltips": {

diff --git a/app/Resources/layouts/Settings/damSettings.json b/app/Resources/layouts/Settings/damSettings.json
@@ -2,6 +2,12 @@
   {
     "label": "File Settings",
     "rows": [
+      [
+        {
+          "name": "attachmentDuplicates"
+        },
+        false
+      ],
       [
         {
           "name": "fileNameRegexPattern"

diff --git a/app/Resources/metadata/entityDefs/Settings.json b/app/Resources/metadata/entityDefs/Settings.json
@@ -1,5 +1,21 @@
 {
   "fields": {
+    "attachmentDuplicates": {
+      "type": "enum",
+      "default": "notAllowByContentAndName",
+      "optionsIds": [
+        "notAllowByContentAndName",
+        "notAllowByContent",
+        "notAllowByName",
+        "allow"
+      ],
+      "options": [
+        "notAllowByContentAndName",
+        "notAllowByContent",
+        "notAllowByName",
+        "allow"
+      ]
+    },
     "fileNameRegexPattern": {
       "type": "varchar",
       "default": "/^[^\\\\\\/:\\*\\\"\\?<>%|\\s,]{1,64}/",

diff --git a/app/Services/Attachment.php b/app/Services/Attachment.php
@@ -140,6 +140,30 @@ public function createEntity($attachment)
         return $entity;
     }
 
+    public function findAttachmentDuplicate(\stdClass $attachment): ?Entity
+    {
+        // skip duplicates checking for stream attachments
+        if (property_exists($attachment, 'relatedType') && $attachment->relatedType === 'Note') {
+            return null;
+        }
+
+        $duplicateParam = $this->getConfig()->get('attachmentDuplicates', 'notAllowByContentAndName');
+
+        if ($duplicateParam == 'notAllowByContent' && property_exists($attachment, 'md5')) {
+            return $this->getRepository()->where(['md5' => $attachment->md5])->findOne();
+        }
+
+        if ($duplicateParam == 'notAllowByName' && property_exists($attachment, 'name')) {
+            return $this->getRepository()->where(['name' => $attachment->name])->findOne();
+        }
+
+        if ($duplicateParam == 'notAllowByContentAndName' && property_exists($attachment, 'md5') && property_exists($attachment, 'name')) {
+            return $this->getRepository()->where(['md5' => $attachment->md5, 'name' => $attachment->name])->findOne();
+        }
+
+        return null;
+    }
+
     public function attachmentHasAsset(\stdClass $input = null): bool
     {
         if (!empty($input) && property_exists($input, 'relatedType') && $input->relatedType === 'Note') {

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
   "description": "AtroDAM. Open source DAM application.",
   "require": {
     "ext-fileinfo": "*",
-    "atrocore/core": ">1.4.146 <1.7.0"
+    "atrocore/core": "~1.6.15"
   },
   "conflict": {
     "atrocore/pim": "<1.8.0"