From 9ccaf85078da4efa28e5d4a7315459b1c8c68e9e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 18 Nov 2013 17:29:30 +0100
Subject: External storage space is now not counted in total space

Added argument to getFileInfo() to disable adding the size of
mountpoints to a directory's size.

Backport of 614e4d485c8b74f6879c401f8cbb93e9335bf9b3
---
 lib/files/filesystem.php | 6 ++++--
 lib/files/view.php       | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'lib/files')

diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 1850d50f971..95bdd100cbf 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -624,6 +624,8 @@ class Filesystem {
 	 * get the filesystem info
 	 *
 	 * @param string $path
+	 * @param boolean $includeMountPoints whether to add mountpoint sizes,
+	 * defaults to true
 	 * @return array
 	 *
 	 * returns an associative array with the following keys:
@@ -633,8 +635,8 @@ class Filesystem {
 	 * - encrypted
 	 * - versioned
 	 */
-	public static function getFileInfo($path) {
-		return self::$defaultInstance->getFileInfo($path);
+	public static function getFileInfo($path, $includeMountPoints = true) {
+		return self::$defaultInstance->getFileInfo($path, $includeMountPoints);
 	}
 
 	/**
diff --git a/lib/files/view.php b/lib/files/view.php
index f02e3d4d513..fd408fecfd7 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -750,6 +750,8 @@ class View {
 	 * get the filesystem info
 	 *
 	 * @param string $path
+	 * @param boolean $includeMountPoints whether to add mountpoint sizes,
+	 * defaults to true
 	 * @return array
 	 *
 	 * returns an associative array with the following keys:
@@ -759,7 +761,7 @@ class View {
 	 * - encrypted
 	 * - versioned
 	 */
-	public function getFileInfo($path) {
+	public function getFileInfo($path, $includeMountPoints = true) {
 		$data = array();
 		if (!Filesystem::isValidPath($path)) {
 			return $data;
@@ -786,7 +788,7 @@ class View {
 			$data = $cache->get($internalPath);
 
 			if ($data and $data['fileid']) {
-				if ($data['mimetype'] === 'httpd/unix-directory') {
+				if ($includeMountPoints and $data['mimetype'] === 'httpd/unix-directory') {
 					//add the sizes of other mountpoints to the folder
 					$mountPoints = Filesystem::getMountPoints($path);
 					foreach ($mountPoints as $mountPoint) {
-- 
cgit v1.2.3