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

split of scanning the childs of a folder

This commit is contained in:
Robin Appelman 2013-06-14 15:30:41 +02:00
parent 8d62bb3aab
commit 30c09d0c8b
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,8 @@
namespace OC\Files\Cache; namespace OC\Files\Cache;
use OC\Files\Filesystem;
class Scanner { class Scanner {
/** /**
* @var \OC\Files\Storage\Storage $storage * @var \OC\Files\Storage\Storage $storage
@ -63,8 +65,8 @@ class Scanner {
* @return array with metadata of the scanned file * @return array with metadata of the scanned file
*/ */
public function scanFile($file, $checkExisting = false) { public function scanFile($file, $checkExisting = false) {
if ( ! self::isPartialFile($file) if (!self::isPartialFile($file)
and ! \OC\Files\Filesystem::isFileBlacklisted($file) and !Filesystem::isFileBlacklisted($file)
) { ) {
\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_file', array('path' => $file, 'storage' => $this->storageId)); \OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_file', array('path' => $file, 'storage' => $this->storageId));
$data = $this->getData($file); $data = $this->getData($file);
@ -84,7 +86,8 @@ class Scanner {
$data['size'] = $cacheData['size']; $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 // Only update metadata that has changed
@ -100,38 +103,42 @@ class Scanner {
} }
/** /**
* scan all the files in a folder and store them in the cache * scan a folder and all it's children
* *
* @param string $path * @param string $path
* @param bool $recursive * @param bool $recursive
* @param bool $onlyChilds
* @return int the size of the scanned folder or -1 if the size is unknown at this stage * @return int the size of the scanned folder or -1 if the size is unknown at this stage
*/ */
public function scan($path, $recursive = self::SCAN_RECURSIVE, $onlyChilds = false) { public function scan($path, $recursive = self::SCAN_RECURSIVE) {
\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_folder', array('path' => $path, 'storage' => $this->storageId)); $this->scanFile($path);
$childQueue = array(); return $this->scanChildren($path, $recursive);
if (!$onlyChilds) { }
$this->scanFile($path);
}
/**
* scan all the files and folders in a folder
*
* @param string $path
* @param bool $recursive
* @return int the size of the scanned folder or -1 if the size is unknown at this stage
*/
public function scanChildren($path, $recursive = self::SCAN_RECURSIVE) {
\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_folder', array('path' => $path, 'storage' => $this->storageId));
$size = 0; $size = 0;
$childQueue = array();
if ($this->storage->is_dir($path) && ($dh = $this->storage->opendir($path))) { if ($this->storage->is_dir($path) && ($dh = $this->storage->opendir($path))) {
\OC_DB::beginTransaction(); \OC_DB::beginTransaction();
while ($file = readdir($dh)) { while ($file = readdir($dh)) {
$child = ($path) ? $path . '/' . $file : $file; $child = ($path) ? $path . '/' . $file : $file;
if (!\OC\Files\Filesystem::isIgnoredDir($file)) { if (!Filesystem::isIgnoredDir($file)) {
$data = $this->scanFile($child, $recursive === self::SCAN_SHALLOW); $data = $this->scanFile($child, $recursive === self::SCAN_SHALLOW);
if ($data) { if ($data) {
if ($data['size'] === -1) { if ($data['size'] === -1) {
if ($recursive === self::SCAN_RECURSIVE) { if ($recursive === self::SCAN_RECURSIVE) {
$childQueue[] = $child; $childQueue[] = $child;
$data['size'] = 0;
} else { } else {
$size = -1; $size = -1;
} }
} } else if ($size !== -1) {
if ($size !== -1) {
$size += $data['size']; $size += $data['size'];
} }
} }
@ -139,7 +146,7 @@ class Scanner {
} }
\OC_DB::commit(); \OC_DB::commit();
foreach ($childQueue as $child) { foreach ($childQueue as $child) {
$childSize = $this->scan($child, self::SCAN_RECURSIVE, true); $childSize = $this->scanChildren($child, self::SCAN_RECURSIVE);
if ($childSize === -1) { if ($childSize === -1) {
$size = -1; $size = -1;
} else { } else {