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

[9.0] Call private cache methods only for `OC\Files\Cache\Cache`

This commit is contained in:
Daniel Jagszent 2016-04-22 15:59:13 +02:00 committed by Thomas Müller
parent 5925ab99f8
commit 1aa8765177
No known key found for this signature in database
GPG Key ID: A943788A3BBEC44C
5 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/files/cache/scanner.php vendored
View File

@ -478,7 +478,7 @@ class Scanner extends BasicEmitter implements IScanner {
try {
$callback();
\OC_Hook::emit('Scanner', 'correctFolderSize', array('path' => $path));
if ($this->cacheActive) {
if ($this->cacheActive && $this->cache instanceof Cache) {
$this->cache->correctFolderSize($path);
}
} catch (\OCP\Files\StorageInvalidException $e) {

16
lib/private/files/cache/updater.php vendored
View File

@ -126,7 +126,9 @@ class Updater implements IUpdater {
} else {
// scanner didn't provide size info, fallback to full size calculation
$sizeDifference = 0;
$this->cache->correctFolderSize($path, $data);
if ($this->cache instanceof Cache) {
$this->cache->correctFolderSize($path, $data);
}
}
$this->correctParentStorageMtime($path);
$this->propagator->propagateChange($path, $time, $sizeDifference);
@ -148,7 +150,9 @@ class Updater implements IUpdater {
}
$this->cache->remove($path);
$this->cache->correctFolderSize($parent);
if ($this->cache instanceof Cache) {
$this->cache->correctFolderSize($parent);
}
$this->correctParentStorageMtime($path);
$this->propagator->propagateChange($path, time());
}
@ -190,8 +194,12 @@ class Updater implements IUpdater {
$this->cache->update($fileId, ['mimetype' => $mimeType]);
}
$sourceCache->correctFolderSize($source);
$this->cache->correctFolderSize($target);
if ($sourceCache instanceof Cache) {
$sourceCache->correctFolderSize($source);
}
if ($this->cache instanceof Cache) {
$this->cache->correctFolderSize($target);
}
if ($sourceUpdater instanceof Updater) {
$sourceUpdater->correctParentStorageMtime($source);
}

4
lib/private/files/cache/watcher.php vendored
View File

@ -106,7 +106,9 @@ class Watcher implements IWatcher {
if ($cachedData['mimetype'] === 'httpd/unix-directory') {
$this->cleanFolder($path);
}
$this->cache->correctFolderSize($path);
if ($this->cache instanceof Cache) {
$this->cache->correctFolderSize($path);
}
}
/**

12
lib/private/files/cache/wrapper/cachejail.php vendored
View File

@ -23,6 +23,7 @@
*/
namespace OC\Files\Cache\Wrapper;
use OC\Files\Cache\Cache;
/**
* Jail to a subdirectory of the wrapped cache
@ -233,7 +234,9 @@ class CacheJail extends CacheWrapper {
* @param array $data (optional) meta data of the folder
*/
public function correctFolderSize($path, $data = null) {
$this->cache->correctFolderSize($this->getSourcePath($path), $data);
if ($this->cache instanceof Cache) {
$this->cache->correctFolderSize($this->getSourcePath($path), $data);
}
}
/**
@ -244,7 +247,12 @@ class CacheJail extends CacheWrapper {
* @return int
*/
public function calculateFolderSize($path, $entry = null) {
return $this->cache->calculateFolderSize($this->getSourcePath($path), $entry);
if ($this->cache instanceof Cache) {
return $this->cache->calculateFolderSize($this->getSourcePath($path), $entry);
} else {
return 0;
}
}
/**

10
lib/private/files/cache/wrapper/cachewrapper.php vendored
View File

@ -240,7 +240,9 @@ class CacheWrapper extends Cache {
* @param array $data (optional) meta data of the folder
*/
public function correctFolderSize($path, $data = null) {
$this->cache->correctFolderSize($path, $data);
if ($this->cache instanceof Cache) {
$this->cache->correctFolderSize($path, $data);
}
}
/**
@ -251,7 +253,11 @@ class CacheWrapper extends Cache {
* @return int
*/
public function calculateFolderSize($path, $entry = null) {
return $this->cache->calculateFolderSize($path, $entry);
if ($this->cache instanceof Cache) {
return $this->cache->calculateFolderSize($path, $entry);
} else {
return 0;
}
}
/**