Fix size calculation during recursive scan

diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index 5a71bd26e8979b328e161d320b592484c53e9d88..6cb9807f5a79b587e4477109bdfae41e88cf416d 100644 (file)
--- 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;
                                }
                        }