diff options
| author | Côme Chilliet <91878298+come-nc@users.noreply.github.com> | 2023-05-15 11:42:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-15 11:42:06 +0200 |
| commit | 3bf19f76e69a892663b2e5b02e60fe8fb1c49ae7 (patch) | |
| tree | 81f627a62c6a119bcf14327254cf7459fa3ff60e /lib/private | |
| parent | 2f467d936c7629d42f65e8210a5d27f8eda205a3 (diff) | |
| parent | 1cc1866ba3ce27742e75abb4dc74a48df352f6a3 (diff) | |
| download | nextcloud-server-3bf19f76e69a892663b2e5b02e60fe8fb1c49ae7.tar.gz nextcloud-server-3bf19f76e69a892663b2e5b02e60fe8fb1c49ae7.zip | |
Merge pull request #32961 from nextcloud/more-debug-lazyuserfolder
Make it easier to debug issue #32304
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Files/Node/LazyFolder.php | 7 | ||||
| -rw-r--r-- | lib/private/Files/Node/LazyUserFolder.php | 17 |
2 files changed, 18 insertions, 6 deletions
diff --git a/lib/private/Files/Node/LazyFolder.php b/lib/private/Files/Node/LazyFolder.php index cc1f64889a1..c843baabade 100644 --- a/lib/private/Files/Node/LazyFolder.php +++ b/lib/private/Files/Node/LazyFolder.php @@ -27,6 +27,7 @@ declare(strict_types=1); namespace OC\Files\Node; use OC\Files\Utils\PathHelper; +use OCP\Files\Folder; use OCP\Constants; /** @@ -37,8 +38,8 @@ use OCP\Constants; * * @package OC\Files\Node */ -class LazyFolder implements \OCP\Files\Folder { - /** @var \Closure */ +class LazyFolder implements Folder { + /** @var \Closure(): Folder */ private $folderClosure; /** @var LazyFolder | null */ @@ -49,7 +50,7 @@ class LazyFolder implements \OCP\Files\Folder { /** * LazyFolder constructor. * - * @param \Closure $folderClosure + * @param \Closure(): Folder $folderClosure */ public function __construct(\Closure $folderClosure, array $data = []) { $this->folderClosure = $folderClosure; diff --git a/lib/private/Files/Node/LazyUserFolder.php b/lib/private/Files/Node/LazyUserFolder.php index 81009532dbf..8fbdec4b49d 100644 --- a/lib/private/Files/Node/LazyUserFolder.php +++ b/lib/private/Files/Node/LazyUserFolder.php @@ -28,7 +28,10 @@ use OCP\Constants; use OCP\Files\IRootFolder; use OCP\Files\Mount\IMountManager; use OCP\Files\NotFoundException; +use OCP\Files\Folder; +use OCP\Files\File; use OCP\IUser; +use Psr\Log\LoggerInterface; class LazyUserFolder extends LazyFolder { private IRootFolder $root; @@ -41,14 +44,22 @@ class LazyUserFolder extends LazyFolder { $this->user = $user; $this->mountManager = $mountManager; $this->path = '/' . $user->getUID() . '/files'; - parent::__construct(function () use ($user) { + parent::__construct(function () use ($user): Folder { try { - return $this->root->get('/' . $user->getUID() . '/files'); + $node = $this->root->get($this->path); + if ($node instanceof File) { + $e = new \RuntimeException(); + \OCP\Server::get(LoggerInterface::class)->error('User root storage is not a folder: ' . $this->path, [ + 'exception' => $e, + ]); + throw $e; + } + return $node; } catch (NotFoundException $e) { if (!$this->root->nodeExists('/' . $user->getUID())) { $this->root->newFolder('/' . $user->getUID()); } - return $this->root->newFolder('/' . $user->getUID() . '/files'); + return $this->root->newFolder($this->path); } }, [ 'path' => $this->path, |