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

Merge pull request #6849 from owncloud/checkupdate-reuse 

Reuse the data retrieved from the cache in checkUpdate
This commit is contained in:
icewind1991 2014-01-20 10:37:18 -08:00
parent ee30977383 3d6d8d1bb6
commit 92d8db6f19
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_sharing/lib/watcher.php
View File

@ -32,7 +32,7 @@ class Shared_Watcher extends Watcher {
* @param string $path * @param string $path
*/ */
public function checkUpdate($path) { public function checkUpdate($path) {
if ($path != '' && parent::checkUpdate($path)) { if ($path != '' && parent::checkUpdate($path) === true) {
// since checkUpdate() has already updated the size of the subdirs, // since checkUpdate() 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

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

@ -40,7 +40,7 @@ class Watcher {
* check $path for updates * check $path for updates
* *
* @param string $path * @param string $path
* @return boolean true if path was updated, false otherwise * @return boolean | array true if path was updated, otherwise the cached data is returned
*/ */
public function checkUpdate($path) { public function checkUpdate($path) {
$cachedEntry = $this->cache->get($path); $cachedEntry = $this->cache->get($path);
@ -56,7 +56,7 @@ class Watcher {
$this->cache->correctFolderSize($path); $this->cache->correctFolderSize($path);
return true; return true;
} }
return false; return $cachedEntry;
} }
/** /**

7
lib/private/files/view.php
View File

@ -801,6 +801,7 @@ class View {
* @var string $internalPath * @var string $internalPath
*/ */
list($storage, $internalPath) = Filesystem::resolvePath($path); list($storage, $internalPath) = Filesystem::resolvePath($path);
$data = null;
if ($storage) { if ($storage) {
$cache = $storage->getCache($internalPath); $cache = $storage->getCache($internalPath);
$permissionsCache = $storage->getPermissionsCache($internalPath); $permissionsCache = $storage->getPermissionsCache($internalPath);
@ -811,10 +812,12 @@ class View {
$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW); $scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
} else { } else {
$watcher = $storage->getWatcher($internalPath); $watcher = $storage->getWatcher($internalPath);
$watcher->checkUpdate($internalPath); $data = $watcher->checkUpdate($internalPath);
} }
$data = $cache->get($internalPath); if (!is_array($data)) {
$data = $cache->get($internalPath);
}
if ($data and $data['fileid']) { if ($data and $data['fileid']) {
if ($includeMountPoints and $data['mimetype'] === 'httpd/unix-directory') { if ($includeMountPoints and $data['mimetype'] === 'httpd/unix-directory') {