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

Merge pull request #3335 from owncloud/prevent-scan-loop 

Prevent backgroundScan() from looping
This commit is contained in:
Jörn Friedrich Dreyer 2013-05-21 09:15:22 -07:00
parent afdad5c74d 71eed76dbe
commit fb4d8ddf0a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,9 +179,11 @@ class Scanner {
* walk over any folders that are not fully scanned yet and scan them * walk over any folders that are not fully scanned yet and scan them
*/ */
public function backgroundScan() { public function backgroundScan() {
while (($path = $this->cache->getIncomplete()) !== false) { $lastPath = null;
while (($path = $this->cache->getIncomplete()) !== false && $path !== $lastPath) {
$this->scan($path); $this->scan($path);
$this->cache->correctFolderSize($path); $this->cache->correctFolderSize($path);
$lastPath = $path;
} }
} }
} }