Only check for local shared storages
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
706655ef20
commit
00b17c3af5
|
@ -31,6 +31,7 @@ use OC\Files\Filesystem;
|
|||
use OC\ForbiddenException;
|
||||
use OC\Hooks\PublicEmitter;
|
||||
use OC\Lock\DBLockingProvider;
|
||||
use OCA\Files_Sharing\SharedStorage;
|
||||
use OCP\Files\Storage\IStorage;
|
||||
use OCP\Files\StorageNotAvailableException;
|
||||
use OCP\ILogger;
|
||||
|
@ -128,7 +129,7 @@ class Scanner extends PublicEmitter {
|
|||
}
|
||||
|
||||
// don't scan received local shares, these can be scanned when scanning the owner's storage
|
||||
if ($storage->instanceOfStorage('OCA\Files_Sharing\ISharedStorage')) {
|
||||
if ($storage->instanceOfStorage(SharedStorage::class)) {
|
||||
continue;
|
||||
}
|
||||
$scanner = $storage->getScanner();
|
||||
|
@ -178,7 +179,7 @@ class Scanner extends PublicEmitter {
|
|||
}
|
||||
|
||||
// don't scan received local shares, these can be scanned when scanning the owner's storage
|
||||
if ($storage->instanceOfStorage('OCA\Files_Sharing\ISharedStorage')) {
|
||||
if ($storage->instanceOfStorage(SharedStorage::class)) {
|
||||
continue;
|
||||
}
|
||||
$relativePath = $mount->getInternalPath($dir);
|
||||
|
|
|
@ -11,6 +11,7 @@ namespace Test\Files\Utils;
|
|||
use OC\Files\Filesystem;
|
||||
use OC\Files\Mount\MountPoint;
|
||||
use OC\Files\Storage\Temporary;
|
||||
use OCA\Files_Sharing\SharedStorage;
|
||||
use OCP\Files\Config\IMountProvider;
|
||||
use OCP\Files\Storage\IStorageFactory;
|
||||
use OCP\IUser;
|
||||
|
@ -190,14 +191,14 @@ class ScannerTest extends \Test\TestCase {
|
|||
}
|
||||
|
||||
public function testSkipLocalShares() {
|
||||
$sharedStorage = $this->createMock('OCA\Files_Sharing\SharedStorage');
|
||||
$sharedStorage = $this->createMock(SharedStorage::class);
|
||||
$sharedMount = new MountPoint($sharedStorage, '/share');
|
||||
Filesystem::getMountManager()->addMount($sharedMount);
|
||||
|
||||
$sharedStorage->expects($this->any())
|
||||
->method('instanceOfStorage')
|
||||
->will($this->returnValueMap([
|
||||
['OCA\Files_Sharing\ISharedStorage', true],
|
||||
[SharedStorage::class, true],
|
||||
]));
|
||||
$sharedStorage->expects($this->never())
|
||||
->method('getScanner');
|
||||
|
|
Loading…
Reference in New Issue