Mirrors
/
nextcloud-server
mirror of https://github.com/nextcloud/server
3
0
Fork 0
Code Releases Activity
Browse Source

Prevent apps from affecting the scanner via hook.

remotes/origin/ldap_group_count
ringmaster 12 years ago
parent
26d169b27c
commit
f79948f519
1 changed files with 18 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      lib/private/files/cache/scanner.php

34
lib/private/files/cache/scanner.php
View File

@ -138,9 +138,12 @@ class Scanner extends BasicEmitter {
$parent = '';
}
$parentCacheData = $this->cache->get($parent);
$this->cache->update($parentCacheData['fileid'], array(
'etag' => $this->storage->getETag($parent),
));
\OC_Hook::emit('Scanner', 'updateCache', array('file' => $file, 'data' => $data));
if(Config::getSystemValue('filesystem_check_enable', true)) {
$this->cache->update($parentCacheData['fileid'], array(
'etag' => $this->storage->getETag($parent),
));
}
}
}
}
@ -157,18 +160,16 @@ class Scanner extends BasicEmitter {
}
}
if (!empty($newData)) {
$addToCache = Config::getSystemValue('filesystem_check_enable', true);
\OC_Hook::emit('Scanner', 'addToCache', array('file' => $file, 'addToCache' => &$addToCache, 'data' => &$newData));
if($addToCache) {
\OC_Hook::emit('Scanner', 'addToCache', array('file' => $file, 'data' => $newData));
if(Config::getSystemValue('filesystem_check_enable', true)) {
$data['fileid'] = $this->cache->put($file, $newData);
}
$this->emit('\OC\Files\Cache\Scanner', 'postScanFile', array($file, $this->storageId));
\OC_Hook::emit('\OC\Files\Cache\Scanner', 'post_scan_file', array('path' => $file, 'storage' => $this->storageId));
}
} else {
$removeFromCache = Config::getSystemValue('filesystem_check_enable', true);
\OC_Hook::emit('Scanner', 'removeFromCache', array('file' => $file, 'removeFromCache' => &$removeFromCache));
if($removeFromCache) {
\OC_Hook::emit('Scanner', 'removeFromCache', array('file' => $file));
if(Config::getSystemValue('filesystem_check_enable', true)) {
$this->cache->remove($file);
}
}
@ -253,9 +254,8 @@ class Scanner extends BasicEmitter {
$removedChildren = \array_diff($existingChildren, $newChildren);
foreach ($removedChildren as $childName) {
$child = ($path) ? $path . '/' . $childName : $childName;
$removeFromCache = Config::getSystemValue('filesystem_check_enable', true);
\OC_Hook::emit('Scanner', 'removeFromCache', array('file' => $child, 'removeFromCache' => &$removeFromCache));
if($removeFromCache) {
\OC_Hook::emit('Scanner', 'removeFromCache', array('file' => $child));
if(Config::getSystemValue('filesystem_check_enable', true)) {
$this->cache->remove($child);
}
}
@ -277,9 +277,8 @@ class Scanner extends BasicEmitter {
}
}
$newData = array('size' => $size);
$addToCache = Config::getSystemValue('filesystem_check_enable', true);
\OC_Hook::emit('Scanner', 'addToCache', array('file' => $child, 'addToCache' => &$addToCache, 'data' => &$newData));
if($addToCache) {
\OC_Hook::emit('Scanner', 'addToCache', array('file' => $child, 'data' => $newData));
if(Config::getSystemValue('filesystem_check_enable', true)) {
$this->cache->put($path, $newData);
}
}
@ -308,7 +307,10 @@ class Scanner extends BasicEmitter {
$lastPath = null;
while (($path = $this->cache->getIncomplete()) !== false && $path !== $lastPath) {
$this->scan($path, self::SCAN_RECURSIVE, self::REUSE_ETAG);
$this->cache->correctFolderSize($path);
\OC_Hook::emit('Scanner', 'correctFolderSize', array('path' => $path));
if(Config::getSystemValue('filesystem_check_enable', true)) {
$this->cache->correctFolderSize($path);
}
$lastPath = $path;
}
}

Write Preview
Loading…
Cancel
Save