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

Merge pull request #3532 from owncloud/scan-update 

Only update metadata that has changed
This commit is contained in:
Michael Gapczynski 2013-05-29 10:23:41 -07:00
parent 8a5dec7775 ea55367678
commit 5bbc583b56
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/files/cache/scanner.php vendored
View File

@ -78,18 +78,21 @@ class Scanner {
$this->scanFile($parent); $this->scanFile($parent);
} }
} }
if($cacheData = $this->cache->get($file)) { $newData = $data;
if ($cacheData = $this->cache->get($file)) {
if ($checkExisting && $data['size'] === -1) {
$data['size'] = $cacheData['size'];
}
if ($data['mtime'] === $cacheData['mtime'] && if ($data['mtime'] === $cacheData['mtime'] &&
$data['size'] === $cacheData['size']) { $data['size'] === $cacheData['size']) {
$data['etag'] = $cacheData['etag']; $data['etag'] = $cacheData['etag'];
} }
// Only update metadata that has changed
$newData = array_diff($data, $cacheData);
} }
if ($checkExisting and $cacheData) { if (!empty($newData)) {
if ($data['size'] === -1) { $this->cache->put($file, $newData);
$data['size'] = $cacheData['size'];
}
} }
$this->cache->put($file, $data);
} }
return $data; return $data;
} }