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.

1 files changed, 9 insertions, 0 deletions

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