Split checkUpdate
This commit is contained in:
parent
5a25f1c2a0
commit
0397871f7e
|
@ -29,41 +29,41 @@ namespace OC\Files\Cache;
|
||||||
* check the storage backends for updates and change the cache accordingly
|
* check the storage backends for updates and change the cache accordingly
|
||||||
*/
|
*/
|
||||||
class Shared_Watcher extends Watcher {
|
class Shared_Watcher extends Watcher {
|
||||||
|
/**
|
||||||
|
* @var \OC\Files\Storage\Shared $storage
|
||||||
|
*/
|
||||||
|
protected $storage;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* check $path for updates
|
* Update the cache for changes to $path
|
||||||
*
|
*
|
||||||
* @param string $path
|
* @param string $path
|
||||||
* @param array $cachedEntry
|
* @param array $cachedData
|
||||||
* @return boolean true if path was updated
|
|
||||||
*/
|
*/
|
||||||
public function checkUpdate($path, $cachedEntry = null) {
|
public function update($path, $cachedData) {
|
||||||
if (parent::checkUpdate($path, $cachedEntry) === true) {
|
parent::update($path, $cachedData);
|
||||||
// since checkUpdate() has already updated the size of the subdirs,
|
// since parent::update() has already updated the size of the subdirs,
|
||||||
// only apply the update to the owner's parent dirs
|
// only apply the update to the owner's parent dirs
|
||||||
|
|
||||||
// find last parent before reaching the shared storage root,
|
// find last parent before reaching the shared storage root,
|
||||||
// which is the actual shared dir from the owner
|
// which is the actual shared dir from the owner
|
||||||
$sepPos = strpos($path, '/');
|
$sepPos = strpos($path, '/');
|
||||||
if ($sepPos > 0) {
|
if ($sepPos > 0) {
|
||||||
$baseDir = substr($path, 0, $sepPos);
|
$baseDir = substr($path, 0, $sepPos);
|
||||||
} else {
|
} else {
|
||||||
$baseDir = $path;
|
$baseDir = $path;
|
||||||
}
|
|
||||||
|
|
||||||
// find the path relative to the data dir
|
|
||||||
$file = $this->storage->getFile($baseDir);
|
|
||||||
$view = new \OC\Files\View('/' . $file['fileOwner']);
|
|
||||||
|
|
||||||
// find the owner's storage and path
|
|
||||||
list($storage, $internalPath) = $view->resolvePath($file['path']);
|
|
||||||
|
|
||||||
// update the parent dirs' sizes in the owner's cache
|
|
||||||
$storage->getCache()->correctFolderSize(dirname($internalPath));
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
return false;
|
|
||||||
|
// find the path relative to the data dir
|
||||||
|
$file = $this->storage->getFile($baseDir);
|
||||||
|
$view = new \OC\Files\View('/' . $file['fileOwner']);
|
||||||
|
|
||||||
|
// find the owner's storage and path
|
||||||
|
/** @var \OC\Files\Storage\Storage $storage */
|
||||||
|
list($storage, $internalPath) = $view->resolvePath($file['path']);
|
||||||
|
|
||||||
|
// update the parent dirs' sizes in the owner's cache
|
||||||
|
$storage->getCache()->correctFolderSize(dirname($internalPath));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -74,36 +74,56 @@ class Watcher {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* check $path for updates
|
* check $path for updates and update if needed
|
||||||
*
|
*
|
||||||
* @param string $path
|
* @param string $path
|
||||||
* @param array $cachedEntry
|
* @param array $cachedEntry
|
||||||
* @return boolean true if path was updated
|
* @return boolean true if path was updated
|
||||||
*/
|
*/
|
||||||
public function checkUpdate($path, $cachedEntry = null) {
|
public function checkUpdate($path, $cachedEntry = null) {
|
||||||
if ($this->watchPolicy === self::CHECK_ALWAYS or ($this->watchPolicy === self::CHECK_ONCE and array_search($path, $this->checkedPaths) === false)) {
|
if (is_null($cachedEntry)) {
|
||||||
if (is_null($cachedEntry)) {
|
$cachedEntry = $this->cache->get($path);
|
||||||
$cachedEntry = $this->cache->get($path);
|
}
|
||||||
}
|
if ($this->needsUpdate($path, $cachedEntry)) {
|
||||||
$this->checkedPaths[] = $path;
|
$this->update($path, $cachedEntry);
|
||||||
if ($this->storage->hasUpdated($path, $cachedEntry['storage_mtime'])) {
|
return true;
|
||||||
if ($this->storage->is_dir($path)) {
|
|
||||||
$this->scanner->scan($path, Scanner::SCAN_SHALLOW);
|
|
||||||
} else {
|
|
||||||
$this->scanner->scanFile($path);
|
|
||||||
}
|
|
||||||
if ($cachedEntry['mimetype'] === 'httpd/unix-directory') {
|
|
||||||
$this->cleanFolder($path);
|
|
||||||
}
|
|
||||||
$this->cache->correctFolderSize($path);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update the cache for changes to $path
|
||||||
|
*
|
||||||
|
* @param string $path
|
||||||
|
* @param array $cachedData
|
||||||
|
*/
|
||||||
|
public function update($path, $cachedData) {
|
||||||
|
if ($this->storage->is_dir($path)) {
|
||||||
|
$this->scanner->scan($path, Scanner::SCAN_SHALLOW);
|
||||||
|
} else {
|
||||||
|
$this->scanner->scanFile($path);
|
||||||
|
}
|
||||||
|
if ($cachedData['mimetype'] === 'httpd/unix-directory') {
|
||||||
|
$this->cleanFolder($path);
|
||||||
|
}
|
||||||
|
$this->cache->correctFolderSize($path);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the cache for $path needs to be updated
|
||||||
|
*
|
||||||
|
* @param string $path
|
||||||
|
* @param array $cachedData
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function needsUpdate($path, $cachedData) {
|
||||||
|
if ($this->watchPolicy === self::CHECK_ALWAYS or ($this->watchPolicy === self::CHECK_ONCE and array_search($path, $this->checkedPaths) === false)) {
|
||||||
|
return $this->storage->hasUpdated($path, $cachedData['storage_mtime']);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* remove deleted files in $path from the cache
|
* remove deleted files in $path from the cache
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue