move correctFolderSize from Scanner to Cache

4 files changed, 18 insertions, 18 deletions

diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index 83d3585bb5f..7c6bba4fadb 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -341,6 +341,22 @@ class Cache {
 	}
 
 	/**
+	 * update the folder size and the size of all parent folders
+	 *
+	 * @param $path
+	 */
+	public function correctFolderSize($path) {
+		$this->calculateFolderSize($path);
+		if ($path !== '') {
+			$parent = dirname($path);
+			if ($parent === '.') {
+				$parent = '';
+			}
+			$this->correctFolderSize($parent);
+		}
+	}
+
+	/**
 	 * get the size of a folder and set it in the cache
 	 *
 	 * @param string $path
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 7062888d74a..0adde1d354d 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -107,20 +107,4 @@ class Scanner {
 		}
 		return $size;
 	}
-
-	/**
-	 * update the folder size and the size of all parent folders
-	 *
-	 * @param $path
-	 */
-	public function correctFolderSize($path) {
-		$this->cache->calculateFolderSize($path);
-		if ($path !== '') {
-			$parent = dirname($path);
-			if ($parent === '.') {
-				$parent = '';
-			}
-			$this->correctFolderSize($parent);
-		}
-	}
 }
diff --git a/lib/files/cache/watcher.php b/lib/files/cache/watcher.php
index f04ca9b4656..d6039d9945c 100644
--- a/lib/files/cache/watcher.php
+++ b/lib/files/cache/watcher.php
@@ -50,7 +50,7 @@ class Watcher {
 			} else {
 				$this->scanner->scanFile($path);
 			}
-			$this->scanner->correctFolderSize($path);
+			$this->cache->correctFolderSize($path);
 		}
 	}
 
diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index 34d38c42736..f784a82dada 100644
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -98,7 +98,7 @@ class Scanner extends \UnitTestCase {
 
 		$this->assertNotEqual($cachedDataFolder2['size'], -1);
 
-		$this->scanner->correctFolderSize('folder');
+		$this->cache->correctFolderSize('folder');
 
 		$cachedDataFolder = $this->cache->get('');
 		$this->assertNotEqual($cachedDataFolder['size'], -1);