diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-03 17:57:56 +0200 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-05 08:22:01 +0200 |
commit | da3974bcb210a6580c974e1b2efebcae26ccf708 (patch) | |
tree | de4dbee3b1e0baacd6ba3600773a4178142181ed /lib/private/files/cache/scanner.php | |
parent | ade6ed37976b405322e428df8c6697116fc9692f (diff) | |
download | nextcloud-server-da3974bcb210a6580c974e1b2efebcae26ccf708.tar.gz nextcloud-server-da3974bcb210a6580c974e1b2efebcae26ccf708.zip |
- drop permissions table and related code
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
Diffstat (limited to 'lib/private/files/cache/scanner.php')
-rw-r--r-- | lib/private/files/cache/scanner.php | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index b97070fcdf0..f4ff8c85fac 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -40,11 +40,6 @@ class Scanner extends BasicEmitter { protected $cache; /** - * @var \OC\Files\Cache\Permissions $permissionsCache - */ - protected $permissionsCache; - - /** * @var boolean $cacheActive If true, perform cache operations, if false, do not affect cache */ protected $cacheActive; @@ -59,7 +54,6 @@ class Scanner extends BasicEmitter { $this->storage = $storage; $this->storageId = $this->storage->getId(); $this->cache = $storage->getCache(); - $this->permissionsCache = $storage->getPermissionsCache(); $this->cacheActive = !Config::getSystemValue('filesystem_cache_readonly', false); } @@ -86,6 +80,7 @@ class Scanner extends BasicEmitter { } $data['etag'] = $this->storage->getETag($path); $data['storage_mtime'] = $data['mtime']; + $data['permissions'] = $this->storage->getPermissions($path); return $data; } @@ -117,9 +112,6 @@ class Scanner extends BasicEmitter { $newData = $data; $cacheData = $this->cache->get($file); if ($cacheData) { - if (isset($cacheData['fileid'])) { - $this->permissionsCache->remove($cacheData['fileid']); - } if ($reuseExisting) { // prevent empty etag if (empty($cacheData['etag'])) { |