From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 3 Jun 2014 09:55:35 +0000 (+0200)
Subject: Fix size calculation during recursive scan
X-Git-Tag: v7.0.0alpha2~122^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a6bb1e1bf8bcea9c4ad4e13e73f397efcc6fc27b;p=nextcloud-server.git

Fix size calculation during recursive scan
---

diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index 5a71bd26e89..6cb9807f5a7 100644
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@ -174,7 +174,6 @@ class Scanner extends BasicEmitter {
 	 * @return int the id of the added file
 	 */
 	protected function addToCache($path, $data) {
-		echo "add";
 		\OC_Hook::emit('Scanner', 'addToCache', array('file' => $path, 'data' => $data));
 		$this->emit('\OC\Files\Cache\Scanner', 'addToCache', array($path, $this->storageId, $data));
 		if ($this->cacheActive) {
@@ -250,11 +249,8 @@ class Scanner extends BasicEmitter {
 							if ($data) {
 								if ($data['mimetype'] === 'httpd/unix-directory' and $recursive === self::SCAN_RECURSIVE) {
 									$childQueue[] = $child;
-								}
-								if ($data['size'] === -1) {
-									if ($recursive !== self::SCAN_RECURSIVE) {
-										$size = -1;
-									}
+								} else if ($data['size'] === -1) {
+									$size = -1;
 								} else if ($size !== -1) {
 									$size += $data['size'];
 								}
@@ -287,7 +283,7 @@ class Scanner extends BasicEmitter {
 				$childSize = $this->scanChildren($child, self::SCAN_RECURSIVE, $reuse);
 				if ($childSize === -1) {
 					$size = -1;
-				} else {
+				} else if ($size !== -1) {
 					$size += $childSize;
 				}
 			}