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