Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve logic for getting the watcher for a shared external storage #40363

Merged
merged 3 commits into from
Feb 24, 2024
Merged

improve logic for getting the watcher for a shared external storage #40363

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6eb127
improve logic for getting the watcher for a shared external storage
icewind1991 Sep 11, 2023
0eba957
Merge branch 'master' into share-external-watcher
skjnldsv Feb 23, 2024
47350a9
Merge branch 'master' into share-external-watcher
skjnldsv Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions apps/files_sharing/lib/SharedStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@
use OC\Files\Storage\Home;
use OC\Files\Storage\Wrapper\PermissionsMask;
use OC\User\NoUserException;
use OCA\Files_External\Config\ExternalMountPoint;
use OCA\Files_External\Config\ConfigAdapter;
use OCP\Constants;
use OCP\Files\Cache\ICacheEntry;
use OCP\Files\Config\IUserMountCache;
use OCP\Files\Folder;
use OCP\Files\IHomeStorage;
use OCP\Files\IRootFolder;
Expand Down Expand Up @@ -431,21 +432,29 @@ public function getOwner($path): string {
}

public function getWatcher($path = '', $storage = null): Watcher {
$mountManager = \OC::$server->getMountManager();
if ($this->watcher) {
return $this->watcher;
}

// Get node information
$node = $this->getShare()->getNodeCacheEntry();
if ($node) {
$mount = $mountManager->findByNumericId($node->getStorageId());
// If the share is originating from an external storage
if (count($mount) > 0 && $mount[0] instanceof ExternalMountPoint) {
// Propagate original storage scan
return parent::getWatcher($path, $storage);
/** @var IUserMountCache $userMountCache */
$userMountCache = \OC::$server->get(IUserMountCache::class);
$mounts = $userMountCache->getMountsForStorageId($node->getStorageId());
foreach ($mounts as $mount) {
// If the share is originating from an external storage
if ($mount->getMountProvider() === ConfigAdapter::class) {
// Propagate original storage scan
$this->watcher = parent::getWatcher($path, $storage);
return $this->watcher;
}
}
}

// cache updating is handled by the share source
return new NullWatcher();
$this->watcher = new NullWatcher();
return $this->watcher;
}

/**
Expand Down
Loading