wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix size calculation during recursive scan

Browse source
This commit is contained in:
Robin Appelman 2014-06-03 11:55:35 +02:00
parent f297bf14f9
commit a6bb1e1bf8
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/private/files/cache/scanner.php vendored
View file

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