Root size for home storage is now size of "files" subdir

Fixes #4593

2 files changed, 39 insertions, 0 deletions

diff --git a/lib/private/files/cache/homecache.php b/lib/private/files/cache/homecache.php
index 4b14bd12190..18dfbfe3191 100644
--- a/lib/private/files/cache/homecache.php
+++ b/lib/private/files/cache/homecache.php
@@ -37,4 +37,17 @@ class HomeCache extends Cache {
 		}
 		return $totalSize;
 	}
+
+	public function get($path) {
+		$data = parent::get($path);
+		if ($path === '' or $path === '/') {
+			// only the size of the "files" dir counts
+			$filesData = parent::get('files');
+
+			if (isset($filesData['size'])) {
+				$data['size'] = $filesData['size'];
+			}
+		}
+		return $data;
+	}
 }
diff --git a/tests/lib/files/cache/homecache.php b/tests/lib/files/cache/homecache.php
index ebf2b7270da..2fa7f1ba92e 100644
--- a/tests/lib/files/cache/homecache.php
+++ b/tests/lib/files/cache/homecache.php
@@ -92,4 +92,30 @@ class HomeCache extends \PHPUnit_Framework_TestCase {
 		$this->assertFalse($this->cache->inCache($dir1));
 		$this->assertFalse($this->cache->inCache($dir2));
 	}
+
+	public function testRootFolderSizeIsFilesSize() {
+		$dir1 = 'files';
+		$afile = 'test.txt';
+		$fileData = array();
+		$fileData[''] = array('size' => 1500, 'mtime' => 20, 'mimetype' => 'httpd/unix-directory');
+		$fileData[$dir1] = array('size' => 1000, 'mtime' => 20, 'mimetype' => 'httpd/unix-directory');
+		$fileData[$afile] = array('size' => 500, 'mtime' => 20);
+
+		$this->cache->put('', $fileData['']);
+		$this->cache->put($dir1, $fileData[$dir1]);
+
+		$this->assertTrue($this->cache->inCache($dir1));
+
+		// check that root size ignored the unknown sizes
+		$data = $this->cache->get('files');
+		$this->assertEquals(1000, $data['size']);
+		$data = $this->cache->get('');
+		$this->assertEquals(1000, $data['size']);
+
+		// clean up
+		$this->cache->remove('');
+		$this->cache->remove($dir1);
+
+		$this->assertFalse($this->cache->inCache($dir1));
+	}
 }