Fix recursive scanning
This commit is contained in:
parent
e002ff6065
commit
6689d67a5b
|
@ -174,6 +174,7 @@ class Scanner extends BasicEmitter {
|
|||
* @return int the id of the added file
|
||||
*/
|
||||
protected function addToCache($path, $data) {
|
||||
echo "add";
|
||||
\OC_Hook::emit('Scanner', 'addToCache', array('file' => $path, 'data' => $data));
|
||||
$this->emit('\OC\Files\Cache\Scanner', 'addToCache', array($path, $this->storageId, $data));
|
||||
if ($this->cacheActive) {
|
||||
|
@ -247,10 +248,11 @@ class Scanner extends BasicEmitter {
|
|||
try {
|
||||
$data = $this->scanFile($child, $reuse, true);
|
||||
if ($data) {
|
||||
if ($data['mimetype'] === 'httpd/unix-directory' and $recursive === self::SCAN_RECURSIVE) {
|
||||
$childQueue[] = $child;
|
||||
}
|
||||
if ($data['size'] === -1) {
|
||||
if ($recursive === self::SCAN_RECURSIVE) {
|
||||
$childQueue[] = $child;
|
||||
} else {
|
||||
if ($recursive !== self::SCAN_RECURSIVE) {
|
||||
$size = -1;
|
||||
}
|
||||
} else if ($size !== -1) {
|
||||
|
|
Loading…
Reference in New Issue