Delete directory after delete all images

GalleryBehavior.php

@@ -142,8 +142,7 @@ public function beforeDelete()
         foreach ($images as $image) {
             $this->deleteImage($image->id);
         }
-        $dirPath = $this->directory . '/' . $this->getGalleryId();
-        @rmdir($dirPath);
+        $this->removeDirectory($this->getDirectoryPath());
     }
 
     public function afterFind()
@@ -223,6 +222,27 @@ public function getFilePath($imageId, $version = 'original')
         return $this->directory . '/' . $this->getFileName($imageId, $version);
     }
 
+    public function getDirectoryPath()
+    {
+        return $this->directory . '/' . $this->getGalleryId();
+    }
+
+    /**
+     * Get Gallery Id
+     *
+     * @return mixed as string or integer
+     * @throws Exception
+     */
+    public function getGalleryId()
+    {
+        $pk = $this->owner->getPrimaryKey();
+        if (is_array($pk)) {
+            return implode($this->pkGlue, $pk);
+        } else {
+            return $pk;
+        }
+    }
+
     /**
      * Replace existing image by specified file
      *
@@ -252,31 +272,48 @@ public function replaceImage($imageId, $path)
         }
     }
 
+    /**
+     * Remove single image file
+     * @param $fileName
+     * @return bool
+     */
     private function removeFile($fileName)
     {
-        return FileHelper::unlink($fileName);
+        try {
+            return FileHelper::unlink($fileName);
+        } catch (\yii\base\ErrorException $exception) {
+            return false;
+        }
     }
 
     /**
-     * Get Gallery Id
-     *
-     * @return mixed as string or integer
-     * @throws Exception
+     * Remove a folders for gallery files
+     * @param $filePath string the filename of image
+     * @return bool
      */
-    public function getGalleryId()
+    private function removeDirectory($filePath)
     {
-        $pk = $this->owner->getPrimaryKey();
-        if (is_array($pk)) {
-            return implode($this->pkGlue, $pk);
-        } else {
-            return $pk;
+        try {
+            FileHelper::removeDirectory(dirname($filePath));
+        } catch (\yii\base\ErrorException $exception) {
+            return false;
         }
-    }
 
+        return true;
+    }
 
+    /**
+     * Create a folders for gallery files
+     * @param $filePath string the filename of image
+     * @return bool
+     */
     private function createFolders($filePath)
     {
-        return FileHelper::createDirectory(FileHelper::normalizePath(dirname($filePath)), 0777);
+        try {
+            return FileHelper::createDirectory(FileHelper::normalizePath(dirname($filePath)), 0777);
+        } catch (\yii\base\Exception $exception) {
+            return false;
+        }
     }
 
     /////////////////////////////// ========== Public Actions ============ ///////////////////////////
@@ -287,10 +324,7 @@ public function deleteImage($imageId)
             $this->removeFile($filePath);
         }
         $filePath = $this->getFilePath($imageId, 'original');
-        $parts = explode('/', $filePath);
-        $parts = array_slice($parts, 0, count($parts) - 1);
-        $dirPath = implode('/', $parts);
-        @rmdir($dirPath);
+        $this->removeDirectory($filePath);
 
         $db = \Yii::$app->db;
         $db->createCommand()
@@ -314,6 +348,9 @@ function ($image) use (&$removed) {
                 }
             );
         }
+        if (is_null($this->_images)) {
+            $this->removeDirectory($this->getDirectoryPath());
+        }
     }
 
     public function addImage($fileName)

changelog.md

@@ -1,5 +1,8 @@
-# Gallery manaager extension changelog
+# Gallery manager extension changelog
 
+Nov 19, 2018
+  - After remove all gallery images from model the corresponded folder also will be removing 
+
 Apr 3, 2015
   - Added possibility to change table name for gallery images