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

Merge branch 'filesystem' into filesystem-etags 

Conflicts:
	lib/files/cache/updater.php
This commit is contained in:
Michael Gapczynski 2012-12-30 21:26:48 -05:00
parent 29b82ccdf3 3ee3323b87
commit aea8b0ff5c
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,11 +30,13 @@ class Updater {
* @var string $internalPath * @var string $internalPath
*/ */
list($storage, $internalPath) = self::resolvePath($path); list($storage, $internalPath) = self::resolvePath($path);
$cache = new Cache($storage); if ($storage) {
$scanner = new Scanner($storage); $cache = $storage->getCache();
$scanner->scan($internalPath, Scanner::SCAN_SHALLOW); $scanner = $storage->getScanner();
$cache->correctFolderSize($internalPath); $scanner->scan($internalPath, Scanner::SCAN_SHALLOW);
self::eTagUpdate($path); $cache->correctFolderSize($internalPath);
self::eTagUpdate($path);
}
} }
static public function deleteUpdate($path) { static public function deleteUpdate($path) {
@ -43,10 +45,12 @@ class Updater {
* @var string $internalPath * @var string $internalPath
*/ */
list($storage, $internalPath) = self::resolvePath($path); list($storage, $internalPath) = self::resolvePath($path);
$cache = new Cache($storage); if ($storage) {
$cache->remove($internalPath); $cache = $storage->getCache();
$cache->correctFolderSize($internalPath); $cache->remove($internalPath);
self::eTagUpdate($path); $cache->correctFolderSize($internalPath);
self::eTagUpdate($path);
}
} }
static public function eTagUpdate($path) { static public function eTagUpdate($path) {