Skip to content
Snippets Groups Projects
Commit aa56d42f authored by Vincent Petry's avatar Vincent Petry
Browse files

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

dont needlessly triger the propgator in the scanner
parents 524479fa f3979e54
No related branches found
No related tags found
No related merge requests found
...@@ -302,7 +302,7 @@ class Scanner extends BasicEmitter implements IScanner { ...@@ -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 { ...@@ -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;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment