2 files changed, 26 insertions, 31 deletions

diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
index 77ef61b2449..8ab852f121f 100644
--- a/lib/private/Files/Cache/Cache.php
+++ b/lib/private/Files/Cache/Cache.php
@@ -900,9 +900,23 @@ class Cache implements ICache {
 	 *
 	 * @param string $path
 	 * @param array $entry (optional) meta data of the folder
+	 * @param bool $ignoreUnknown don't mark the folder size as unknown if any of it's children are unknown
 	 * @return int
 	 */
 	public function calculateFolderSize($path, $entry = null) {
+		return $this->calculateFolderSizeInner($path, $entry);
+	}
+
+
+	/**
+	 * inner function because we can't add new params to the public function without breaking any child classes
+	 *
+	 * @param string $path
+	 * @param array $entry (optional) meta data of the folder
+	 * @param bool $ignoreUnknown don't mark the folder size as unknown if any of it's children are unknown
+	 * @return int
+	 */
+	protected function calculateFolderSizeInner(string $path, array $entry = null, bool $ignoreUnknown = false) {
 		$totalSize = 0;
 		if (is_null($entry) || !isset($entry['fileid'])) {
 			$entry = $this->get($path);
@@ -914,6 +928,9 @@ class Cache implements ICache {
 			$query->select('size', 'unencrypted_size')
 				->from('filecache')
 				->whereParent($id);
+			if ($ignoreUnknown) {
+				$query->andWhere($query->expr()->gte('size', $query->createNamedParameter(0)));
+			}
 
 			$result = $query->execute();
 			$rows = $result->fetchAll();
@@ -956,9 +973,15 @@ class Cache implements ICache {
 			}
 
 			// only set unencrypted size for a folder if any child entries have it set, or the folder is empty
-			$shouldWriteUnEncryptedSize = $unencryptedMax > 0 || $totalSize === 0;
+			$shouldWriteUnEncryptedSize = $unencryptedMax > 0 || $totalSize === 0 || $entry['unencrypted_size'] > 0;
 			if ($entry['size'] !== $totalSize || ($entry['unencrypted_size'] !== $unencryptedTotal && $shouldWriteUnEncryptedSize)) {
 				if ($shouldWriteUnEncryptedSize) {
+
+					// if all children have an unencrypted size of 0, just set the folder unencrypted size to 0 instead of summing the sizes
+					if ($unencryptedMax === 0) {
+						$unencryptedTotal = 0;
+					}
+
 					$this->update($id, [
 						'size' => $totalSize,
 						'unencrypted_size' => $unencryptedTotal,
diff --git a/lib/private/Files/Cache/HomeCache.php b/lib/private/Files/Cache/HomeCache.php
index 5ea65b4d1cb..4ece3ff2de6 100644
--- a/lib/private/Files/Cache/HomeCache.php
+++ b/lib/private/Files/Cache/HomeCache.php
@@ -44,37 +44,9 @@ class HomeCache extends Cache {
 		} elseif ($path === '' or $path === '/') {
 			// since the size of / isn't used (the size of /files is used instead) there is no use in calculating it
 			return 0;
+		} else {
+			return $this->calculateFolderSizeInner($path, $entry, true);
 		}
-
-		$totalSize = 0;
-		if (is_null($entry)) {
-			$entry = $this->get($path);
-		}
-		if ($entry && $entry['mimetype'] === 'httpd/unix-directory') {
-			$id = $entry['fileid'];
-
-			$query = $this->connection->getQueryBuilder();
-			$query->selectAlias($query->func()->sum('size'), 'f1')
-				->from('filecache')
-				->where($query->expr()->eq('parent', $query->createNamedParameter($id)))
-				->andWhere($query->expr()->eq('storage', $query->createNamedParameter($this->getNumericStorageId())))
-				->andWhere($query->expr()->gte('size', $query->createNamedParameter(0)));
-
-			$result = $query->execute();
-			$row = $result->fetch();
-			$result->closeCursor();
-
-			if ($row) {
-				[$sum] = array_values($row);
-				$totalSize = 0 + $sum;
-				$entry['size'] += 0;
-				if ($entry['size'] !== $totalSize) {
-					$this->update($id, ['size' => $totalSize]);
-				}
-			}
-			$result->closeCursor();
-		}
-		return $totalSize;
 	}
 
 	/**