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

Merge branch 'filesystem' of github.com:owncloud/core into filesystem

This commit is contained in:
Robin Appelman 2013-01-20 03:11:50 +01:00
parent 83d6221322 664f33a29c
commit 4c05661875
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ class Updater {
$scanner = $storage->getScanner($internalPath); $scanner = $storage->getScanner($internalPath);
$scanner->scan($internalPath, Scanner::SCAN_SHALLOW); $scanner->scan($internalPath, Scanner::SCAN_SHALLOW);
$cache->correctFolderSize($internalPath); $cache->correctFolderSize($internalPath);
self::eTagUpdate($path); self::correctFolder($path, $storage->filemtime($internalPath));
} }
} }
@ -49,11 +49,17 @@ class Updater {
$cache = $storage->getCache($internalPath); $cache = $storage->getCache($internalPath);
$cache->remove($internalPath); $cache->remove($internalPath);
$cache->correctFolderSize($internalPath); $cache->correctFolderSize($internalPath);
self::eTagUpdate($path); self::correctFolder($path, time());
} }
} }
static public function eTagUpdate($path) { /**
* Update the mtime and ETag of all parent folders
*
* @param string $path
* @param string $time
*/
static public function correctFolder($path, $time) {
if ($path !== '' && $path !== '/') { if ($path !== '' && $path !== '/') {
$parent = dirname($path); $parent = dirname($path);
if ($parent === '.') { if ($parent === '.') {
@ -68,8 +74,8 @@ class Updater {
$cache = $storage->getCache(); $cache = $storage->getCache();
$id = $cache->getId($internalPath); $id = $cache->getId($internalPath);
if ($id !== -1) { if ($id !== -1) {
$cache->update($id, array('etag' => $storage->getETag($internalPath))); $cache->update($id, array('mtime' => $time, 'etag' => $storage->getETag($internalPath)));
self::eTagUpdate($parent); self::correctFolder($parent, $time);
} }
} }
} }