* Add functionality write a log warning instead throwing an exception…

… if the configured media + images file dirctory are not available
techdivision · May 15, 2020 · bfb80a6 · bfb80a6
1 parent 8f7215f
commit bfb80a6
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# Version 18.0.2
+
+## Bugfixes
+
+* None
+
+## Features
+
+* Add functionality write a log warning instead throwing an exception if the configured media + images file dirctory are not available
+
 # Version 18.0.1
 
 ## Bugfixes

diff --git a/etc/configuration/operations.json b/etc/configuration/operations.json
@@ -164,7 +164,9 @@
                     "prefix": "category-create"
                   },
                   "params": {
-                    "copy-images": false
+                    "copy-images": false,
+                    "media-directory" : "pub/media/catalog/category",
+                    "images-file-directory" : "var/importexport/media/catalog/category"
                   },
                   "observers": [
                     {
@@ -233,7 +235,9 @@
                     "prefix": "category-create"
                   },
                   "params": {
-                    "copy-images": false
+                    "copy-images": false,
+                    "media-directory" : "pub/media/catalog/category",
+                    "images-file-directory" : "var/importexport/media/catalog/category"
                   },
                   "observers": [
                     {

diff --git a/src/Subjects/BunchSubject.php b/src/Subjects/BunchSubject.php
@@ -121,20 +121,20 @@ public function setUp($serial)
 
         // initialize media directory => can be absolute or relative
         if ($this->getConfiguration()->hasParam(ConfigurationKeys::MEDIA_DIRECTORY)) {
-            $this->setMediaDir(
-                $this->resolvePath(
-                    $this->getConfiguration()->getParam(ConfigurationKeys::MEDIA_DIRECTORY)
-                )
-            );
+            try {
+                $this->setMediaDir($this->resolvePath($this->getConfiguration()->getParam(ConfigurationKeys::MEDIA_DIRECTORY)));
+            } catch (\InvalidArgumentException $iae) {
+                $this->getSystemLogger()->warning($iae);
+            }
         }
 
         // initialize images directory => can be absolute or relative
         if ($this->getConfiguration()->hasParam(ConfigurationKeys::IMAGES_FILE_DIRECTORY)) {
-            $this->setImagesFileDir(
-                $this->resolvePath(
-                    $this->getConfiguration()->getParam(ConfigurationKeys::IMAGES_FILE_DIRECTORY)
-                )
-            );
+            try {
+                $this->setImagesFileDir($this->resolvePath($this->getConfiguration()->getParam(ConfigurationKeys::IMAGES_FILE_DIRECTORY)));
+            } catch (\InvalidArgumentException $iae) {
+                $this->getSystemLogger()->warning($iae);
+            }
         }
 
         // prepare the callbacks