diff options
author | blizzz <blizzz@arthur-schiwon.de> | 2022-07-22 23:20:43 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-22 23:20:43 +0300 |
commit | 7e13eec524d0b12aa6edd2207fc0b3c84f81bd62 (patch) | |
tree | 0ec17363988f7b9df88b76426cde1aed72638e51 | |
parent | 6f0ae0b95f8514ca441113bf2362d7d43f679238 (diff) | |
parent | 13eef55a925f397afbb5c7d4e058ae080b1ac824 (diff) |
Merge pull request #33308 from nextcloud/fs-setup-builtin-wrappers
always triger setup of builtin storage wrappers
-rw-r--r-- | lib/private/Files/SetupManager.php | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php index f19c9bfa062..5782a5a72a6 100644 --- a/lib/private/Files/SetupManager.php +++ b/lib/private/Files/SetupManager.php @@ -82,6 +82,7 @@ class SetupManager { private IConfig $config; private bool $listeningForProviders; private array $fullSetupRequired = []; + private bool $setupBuiltinWrappersDone = false; public function __construct( IEventLogger $eventLogger, @@ -121,6 +122,15 @@ class SetupManager { } private function setupBuiltinWrappers() { + if ($this->setupBuiltinWrappersDone) { + return; + } + $this->setupBuiltinWrappersDone = true; + + // load all filesystem apps before, so no setup-hook gets lost + OC_App::loadApps(['filesystem']); + $prevLogging = Filesystem::logWarningWhenAddingStorageWrapper(false); + Filesystem::addStorageWrapper('mount_options', function ($mountPoint, IStorage $storage, IMountPoint $mount) { if ($storage->instanceOfStorage(Common::class)) { $storage->setMountOptions($mount->getOptions()); @@ -188,6 +198,8 @@ class SetupManager { } return $storage; }); + + Filesystem::logWarningWhenAddingStorageWrapper($prevLogging); } /** @@ -223,6 +235,9 @@ class SetupManager { return; } $this->setupUsers[] = $user->getUID(); + + $this->setupBuiltinWrappers(); + $prevLogging = Filesystem::logWarningWhenAddingStorageWrapper(false); OC_Hook::emit('OC_Filesystem', 'preSetup', ['user' => $user->getUID()]); @@ -321,14 +336,8 @@ class SetupManager { $this->eventLogger->start('setup_root_fs', 'Setup root filesystem'); - // load all filesystem apps before, so no setup-hook gets lost - OC_App::loadApps(['filesystem']); - $prevLogging = Filesystem::logWarningWhenAddingStorageWrapper(false); - $this->setupBuiltinWrappers(); - Filesystem::logWarningWhenAddingStorageWrapper($prevLogging); - $rootMounts = $this->mountProviderCollection->getRootMounts(); foreach ($rootMounts as $rootMountProvider) { $this->mountManager->addMount($rootMountProvider); |