From 885d12ceb7ed42029ab3bec9a65c5d4a2db2433a Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Thu, 5 Jan 2012 00:43:49 +0000 Subject: [PATCH] Add recursive filesize support to FileObject --- source/lib/MediaListing/File.class.php | 8 -------- source/lib/MediaListing/FileObject.class.php | 6 +++++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/source/lib/MediaListing/File.class.php b/source/lib/MediaListing/File.class.php index 8991552..bcf1885 100644 --- a/source/lib/MediaListing/File.class.php +++ b/source/lib/MediaListing/File.class.php @@ -2,22 +2,14 @@ class MediaListing_File extends MediaListing_FileObject { - protected $size; - public function __construct($path) { if ( ! is_file($path)) { throw new MediaListing_Exception_NotAFile($path); } parent::__construct(parent::TYPE_File, $path); - - $this->size = filesize($this->path); } - public function size() { - return $this->size; - } - } ?> \ No newline at end of file diff --git a/source/lib/MediaListing/FileObject.class.php b/source/lib/MediaListing/FileObject.class.php index d3a1059..af16d4e 100644 --- a/source/lib/MediaListing/FileObject.class.php +++ b/source/lib/MediaListing/FileObject.class.php @@ -39,6 +39,10 @@ abstract class MediaListing_FileObject { return $this->type == self::TYPE_Directory; } + public function size() { + return MediaListing_Main::recursiveFilesize($this->path); + } + public function type() { return $this->type; } @@ -50,7 +54,7 @@ abstract class MediaListing_FileObject { public function basename() { return $this->basename; } - + } ?> \ No newline at end of file