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

Merge pull request #24777 from owncloud/scanner-dont-propagate

Browse source 
dont needlessly triger the propgator in the scanner
This commit is contained in:
Vincent Petry 2016-05-23 19:05:20 +02:00
commit aa56d42fa8
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);
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;
}
if ($lock) {
@ -378,7 +378,9 @@ class Scanner extends BasicEmitter implements IScanner {
$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));
return $size;
}