sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23259 from owncloud/backport-22998 

[stable9] Delay check till scanner is used
remotes/origin/smb_changes_8_to_9
Thomas Müller 2016-03-17 14:29:39 +07:00
parent ec4c5a3e75 987146d5db
commit 00ef623f1c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/files_sharing/lib/external/scanner.php vendored
Unescape Escape View File

@ -36,6 +36,10 @@ class Scanner extends \OC\Files\Cache\Scanner {
/** {@inheritDoc} */
public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
if(!$this->storage->remoteIsOwnCloud()) {
return parent::scan($path, $recursive, $recursive, $lock);
}
$this->scanAll();
}
@ -90,7 +94,6 @@ class Scanner extends \OC\Files\Cache\Scanner {
}
if ($data['status'] === 'success') {
$this->addResult($data['data'], '');
} elseif ($data['status'] === 'unsupported') {
} else {
throw new \Exception(
'Error while scanning remote share: "' .

5
apps/files_sharing/lib/external/storage.php vendored
Unescape Escape View File

@ -148,9 +148,6 @@ class Storage extends DAV implements ISharedStorage {
if (!$storage) {
$storage = $this;
}
if(!$this->remoteIsOwnCloud()) {
return parent::getScanner($path, $storage);
}
if (!isset($this->scanner)) {
$this->scanner = new Scanner($storage);
}
@ -270,7 +267,7 @@ class Storage extends DAV implements ISharedStorage {
*
* @return bool
*/
private function remoteIsOwnCloud() {
public function remoteIsOwnCloud() {
if(defined('PHPUNIT_RUN') || !$this->testRemoteUrl($this->getRemote() . '/status.php')) {
return false;
}