mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dont needlessly triger the propgator in the scanner

This commit is contained in:
Robin Appelman 2016-05-23 13:53:05 +02:00
parent 862d8f43e5
commit f3979e5459
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/Files/Cache/Scanner.php
View File

@ -302,7 +302,7 @@ class Scanner extends BasicEmitter implements IScanner {
} }
$data = $this->scanFile($path, $reuse, -1, null, $lock); $data = $this->scanFile($path, $reuse, -1, null, $lock);
if ($data and $data['mimetype'] === 'httpd/unix-directory') { if ($data and $data['mimetype'] === 'httpd/unix-directory') {
$size = $this->scanChildren($path, $recursive, $reuse, $data, $lock); $size = $this->scanChildren($path, $recursive, $reuse, $data['fileid'], $lock);
$data['size'] = $size; $data['size'] = $size;
} }
if ($lock) { if ($lock) {
@ -378,7 +378,9 @@ class Scanner extends BasicEmitter implements IScanner {
$size += $childSize; $size += $childSize;
} }
} }
$this->updateCache($path, array('size' => $size), $folderId); if ($this->cacheActive) {
$this->cache->update($folderId, array('size' => $size));
}
$this->emit('\OC\Files\Cache\Scanner', 'postScanFolder', array($path, $this->storageId)); $this->emit('\OC\Files\Cache\Scanner', 'postScanFolder', array($path, $this->storageId));
return $size; return $size;
} }