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

Cache: simplify scanner logic a bit when handeling with unknown folder sizes

This commit is contained in:
Robin Appelman 2013-02-10 18:15:23 +01:00
parent 4a130d106c
commit 56d10e9054
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,18 +101,16 @@ class Scanner {
$child = ($path) ? $path . '/' . $file : $file; $child = ($path) ? $path . '/' . $file : $file;
$data = $this->scanFile($child); $data = $this->scanFile($child);
if ($data) { if ($data) {
if ($data['mimetype'] === 'httpd/unix-directory') { if ($data['size'] === -1) {
if ($recursive === self::SCAN_RECURSIVE) { if ($recursive === self::SCAN_RECURSIVE) {
$childQueue[] = $child; $childQueue[] = $child;
$data['size'] = 0; $data['size'] = 0;
} else { } else {
$data['size'] = -1; $size = -1;
} }
} else {
} }
if ($data['size'] === -1) {
$size = -1; if ($size !== -1) {
} elseif ($size !== -1) {
$size += $data['size']; $size += $data['size'];
} }
} }
@ -133,7 +131,7 @@ class Scanner {
} }
return $size; return $size;
} }
/** /**
* @brief check if the file should be ignored when scanning * @brief check if the file should be ignored when scanning
* NOTE: files with a '.part' extension are ignored as well! * NOTE: files with a '.part' extension are ignored as well!
@ -143,8 +141,8 @@ class Scanner {
*/ */
private function isIgnoredFile($file) { private function isIgnoredFile($file) {
if ($file === '.' || $file === '..' if ($file === '.' || $file === '..'
|| pathinfo($file,PATHINFO_EXTENSION) === 'part') || pathinfo($file, PATHINFO_EXTENSION) === 'part'
{ ) {
return true; return true;
} }
return false; return false;