Rename file::unlink() to dir::unlink(). This creates an API that is

clearer about its actions, otherwise we may accidentally blow away an
entire hierarchy when we think we're deleting a single file (there's a
reason why rm won't let you delete dirs that aren't empty!)

Name it "dir" instead of "directory" because apparently "directory" is
already reserved.

Move the delete call out of Items_Controller and into the model.  The
model is responsible for keeping state integrity, not the controller.

4 files changed, 16 insertions, 18 deletions

diff --git a/core/controllers/items.php b/core/controllers/items.php
index 6ba7db65..f10a30c3 100644
--- a/core/controllers/items.php
+++ b/core/controllers/items.php
@@ -102,7 +102,6 @@ class Items_Controller extends REST_Controller {
       module::event("{$item->type}_before_delete", $item);
 
       $item->delete();
-      file::unlink($item->file_path());
     }
 
     url::redirect("{$parent->type}s/{$parent->id}");
diff --git a/core/helpers/MY_file.php b/core/helpers/dir.php
index c460a81a..02599467 100644
--- a/core/helpers/MY_file.php
+++ b/core/helpers/dir.php
@@ -17,19 +17,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class file extends file_Core {
-  public function unlink($path) {
-    if (is_file($path) && is_writable($path)) {
-      return @unlink($path);
-    } else if (is_dir($path) && is_writable($path)) {
+class dir_Core {
+  public static function unlink($path) {
+    if (is_dir($path) && is_writable($path)) {
       foreach (new DirectoryIterator($path) as $resource) {
         if ($resource->isDot()) {
           unset($resource);
           continue;
         } else if ($resource->isFile()) {
-          self::unlink($resource->getPathName());
+          unlink($resource->getPathName());
         } else if ($resource->isDir()) {
-          self::unlink($resource->getRealPath());
+          directory::unlink($resource->getRealPath());
         }
         unset($resource);
       }
diff --git a/core/models/item.php b/core/models/item.php
index 9d23170f..211459b9 100644
--- a/core/models/item.php
+++ b/core/models/item.php
@@ -39,6 +39,15 @@ class Item_Model extends ORM_MPTT {
     return $this->type == 'photo';
   }
 
+  public function delete() {
+    parent::delete();
+    if ($this->is_album()) {
+      directory::unlink($this->file_path());
+    } else {
+      unlink($this->file_path());
+    }
+  }
+
   /**
    * album: /var/albums/album1/album2
    * photo: /var/albums/album1/album2/photo.jpg
diff --git a/core/tests/File_Helper_Test.php b/core/tests/Dir_Helper_Test.php
index dd71aabb..69d891db 100644
--- a/core/tests/File_Helper_Test.php
+++ b/core/tests/Dir_Helper_Test.php
@@ -17,15 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class File_Helper_Test extends Unit_Test_Case {
-  public function remove_file_test() {
-    $filename = tempnam(VARPATH . "albums", "file");
-    touch($filename);
-
-    file::unlink($filename);
-    $this->assert_boolean(!file_exists($filename), "File not deleted");
-  }
-
+class Directory_Helper_Test extends Unit_Test_Case {
   public function remove_album_test() {
     $dirname = (VARPATH . "albums/testdir");
     mkdir($dirname, 0777, true);
@@ -33,7 +25,7 @@ class File_Helper_Test extends Unit_Test_Case {
     $filename = tempnam($dirname, "file");
     touch($filename);
 
-    file::unlink($dirname);
+    dir::unlink($dirname);
     $this->assert_boolean(!file_exists($filename), "File not deleted");
     $this->assert_boolean(!file_exists($dirname), "Directory not deleted");
   }