feat: add IUserFolder similar to IRootFolder by susnux · Pull Request #53048 · nextcloud/server

susnux · 2025-05-22T12:35:59Z

Fixes Move getStorageInfo to non-legacy code #52896

Summary

TBD

Checklist

Code is properly formatted
Sign-off message is added to all commits
Tests (unit, integration, api and/or acceptance) are included
Screenshots before/after for front-end changes
Documentation (manuals or wiki) has been updated or is not required
Backports requested where applicable (ex: critical bugfixes)

come-nc · 2025-12-16T22:48:36Z

I do not understand these last 4 errors and how to get rid of them 😿

There were 4 errors:
1) OCA\Files_Sharing\Tests\ApiTest::testGetShareFromSourceWithReshares
OCP\Files\NotPermittedException: Could not create folder "/test-share-user2", folder exists but unable to get cache entry
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/Folder.php:143
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/Folder.php:501
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/LazyUserFolder.php:50
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/LazyFolder.php:51
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/LazyFolder.php:65
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/LazyFolder.php:206
/home/runner/actions-runner/_work/server/server/lib/private/Share20/Manager.php:210
/home/runner/actions-runner/_work/server/server/lib/private/Share20/Manager.php:639
/home/runner/actions-runner/_work/server/server/apps/files_sharing/tests/ApiTest.php:523
2) OCA\Files_Sharing\Tests\ApiTest::testGetShareFromFolderReshares
OCP\Files\NotPermittedException: Could not create folder "/test-share-user2", folder exists but unable to get cache entry
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/Folder.php:143
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/Folder.php:501
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/LazyUserFolder.php:50
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/LazyFolder.php:51
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/LazyFolder.php:65
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/LazyFolder.php:206
/home/runner/actions-runner/_work/server/server/lib/private/Share20/Manager.php:210
/home/runner/actions-runner/_work/server/server/lib/private/Share20/Manager.php:639
/home/runner/actions-runner/_work/server/server/apps/files_sharing/tests/ApiTest.php:638
3) OCA\Files_Sharing\Tests\ApiTest::testGetShareMultipleSharedFolder
OCP\Files\NotPermittedException: Could not create folder "/test-share-user2", folder exists but unable to get cache entry
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/Folder.php:[143](https://github.com/nextcloud/server/actions/runs/20283089930/job/58250083307?pr=53048#step:8:144)
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/Folder.php:501
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/LazyUserFolder.php:50
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/LazyFolder.php:51
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/LazyFolder.php:65
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/LazyFolder.php:206
/home/runner/actions-runner/_work/server/server/lib/private/Share20/Manager.php:210
/home/runner/actions-runner/_work/server/server/lib/private/Share20/Manager.php:639
/home/runner/actions-runner/_work/server/server/apps/files_sharing/tests/ApiTest.php:825
4) OCA\Files_Sharing\Tests\EtagPropagationTest::testOwnerUnshares
OCP\Files\NotPermittedException: Could not create folder "/test-share-user2", folder exists but unable to get cache entry
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/Folder.php:143
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/Folder.php:501
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/LazyUserFolder.php:50
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/LazyFolder.php:51
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/LazyFolder.php:65
/home/runner/actions-runner/_work/server/server/lib/private/Files/Node/LazyFolder.php:206
/home/runner/actions-runner/_work/server/server/lib/private/Share20/Manager.php:210
/home/runner/actions-runner/_work/server/server/lib/private/Share20/Manager.php:1107
/home/runner/actions-runner/_work/server/server/lib/private/Share20/Manager.php:1[147](https://github.com/nextcloud/server/actions/runs/20283089930/job/58250083307?pr=53048#step:8:148)
/home/runner/actions-runner/_work/server/server/apps/files_sharing/tests/EtagPropagationTest.php:275

come-nc · 2026-03-06T15:01:08Z

The remaining failure comes from the fact that when a user folder exists on disk but not in oc_filecache, it fails to be scanned correctly.
This is because of the failsafe in LocalRootScanner the folder is not scanned and this triggers OCP\Files\NotPermittedException: Could not create folder "/test-share-user2", folder exists but unable to get cache entry

Previous code did not have the issue because it did not try to create /user but directly /user/files, I think.
It’s not clear to me whether /user exists in the hierarchy of folders in the node API. It seems previous code passed null as $parent for user folder, but ready the code of getParent that means it will still try to create a node for /user at some point.

@icewind1991 I’m interested by your input on this and whether you think commit d9df76e is a good idea.

come-nc · 2026-03-09T10:07:51Z

s3 tests are now failing 😭

come-nc · 2026-03-11T15:31:02Z

I rebased on master and now there are new failures in trashbin tests. I’m unable to reproduce those so far.

come-nc · 2026-03-11T16:37:26Z

The failure in files_sharing is related to trashbin as well, so the current issue is related to trashbin.
It does not fail on sqlite, somehow.

I could not find a way to reproduce the issue locally.

susnux · 2026-09-02T20:10:02Z

I could not find a way to reproduce the issue locally.

fixed see last commit, this was caused as the trashbin was never unpaused if the error occurred after the pause

come-nc · 2026-09-10T08:05:46Z

(bumped the version numbers to 36 and rebased on master)

* Implements #52896 Similar to the root folder this represents the users home folder, it allows to group user based methods on the folder like the user quota. Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

…etUserFolder Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

susnux · 2026-09-10T11:10:11Z

/backport b6e35e0 to stable35

susnux · 2026-09-11T12:13:32Z

Documentation: nextcloud/documentation#15605

#53048 added an in_array() call without $strict after the InArrayStrictChecker psalm rule had landed, so static analysis now fails on every pull request. dirname() always returns a string, so strict comparison does not change behaviour. Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>

salmart-dev · 2026-09-11T13:39:47Z

Hey @susnux I think there may be an issue with the changes in this PR and the test that is now failing on master seems to have been skipped in the PR (https://github.com/nextcloud/server/actions/runs/34460275752/job/102816738456)

The code was clearing two caches before, while now it is only clearing one, while the others are still in use and get the outdated quota values. Any PR on top of this fails with the same 2 webdav-related.feature tests getting a -3 instead of the right quota.

susnux added this to the Nextcloud 32 milestone May 22, 2025

susnux added enhancement 3. to review Waiting for reviews labels May 22, 2025

susnux force-pushed the feat/user-folder branch from f31e363 to 2013bba Compare May 22, 2025 13:47

come-nc reviewed Jun 26, 2025

View reviewed changes

Comment thread lib/private/User/User.php Outdated

come-nc assigned susnux Jun 26, 2025

skjnldsv modified the milestones: Nextcloud 32, Nextcloud 33 Sep 28, 2025

come-nc force-pushed the feat/user-folder branch from 2013bba to 89350ae Compare December 16, 2025 10:58

come-nc self-assigned this Dec 16, 2025

come-nc force-pushed the feat/user-folder branch from ec338d9 to ec59b84 Compare December 16, 2025 22:58

blizzz modified the milestones: Nextcloud 33, Nextcloud 34 Feb 16, 2026

come-nc force-pushed the feat/user-folder branch 2 times, most recently from 9e6edb7 to 9526491 Compare February 26, 2026 10:51

come-nc force-pushed the feat/user-folder branch from 9526491 to a3dfd4c Compare March 5, 2026 15:19

come-nc force-pushed the feat/user-folder branch from 386c7d3 to 0c006ff Compare March 11, 2026 14:43

come-nc mentioned this pull request May 19, 2026

fix(OC_Helper): properly calculate quota of shared storages #60341

Merged

7 tasks

nextcloud-bot modified the milestones: Nextcloud 34, Nextcloud 34.0.1 Jun 8, 2026

susnux removed this from the Nextcloud 34.0.1 milestone Jun 9, 2026

come-nc force-pushed the feat/user-folder branch 2 times, most recently from a63b255 to 52b7207 Compare August 27, 2026 13:16

susnux force-pushed the feat/user-folder branch from 3044db1 to a53ad52 Compare September 2, 2026 08:23

come-nc approved these changes Sep 10, 2026

View reviewed changes

susnux added this to the Nextcloud 36 milestone Sep 10, 2026

susnux and others added 12 commits September 10, 2026 11:20

feat(IUserFolder): add a user folder class

0222245

* Implements #52896 Similar to the root folder this represents the users home folder, it allows to group user based methods on the folder like the user quota. Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

chore: migrate away from deprecated OC_Helper to IUserFolder

6e22944

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

fix: Use new getOrCreate method and fix code issues

286642a

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

fix: Adapt LazyRoot::getUserFolder signature and remove LazyFolder::g…

bda8cf3

…etUserFolder Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

chore: Adapt tests to getUserFolder return type change

3f9f865

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

chore: Fix psalm issues and update baseline

4502eb0

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

fix: Do not set parent for user folder

3406d45

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

chore: Fix failing test on s3

3b2a5ff

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

chore: Remove useless check in dav app

8e439db

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

chore: Fix tests

80401b1

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

chore: Bump since and deprecated annotations version

d80b2f9

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

fix(trashbin): properly unpause trashbin on error

b6e35e0

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

come-nc force-pushed the feat/user-folder branch from bf1f534 to b6e35e0 Compare September 10, 2026 09:22

susnux merged commit 8781f0b into master Sep 10, 2026
176 checks passed

susnux deleted the feat/user-folder branch September 10, 2026 11:09

backportbot Bot added the backport-request label Sep 10, 2026

backportbot Bot mentioned this pull request Sep 10, 2026

[stable35] fix(trashbin): properly unpause trashbin on error #64177

Open

backportbot Bot removed the backport-request label Sep 10, 2026

solracsf mentioned this pull request Sep 10, 2026

fix(files): pass the strict flag to in_array() #64201

Merged

7 tasks

susnux mentioned this pull request Sep 11, 2026

feat(developer): add documentation for new IUserFolder nextcloud/documentation#15605

Open

4 tasks

susnux added the pending documentation This pull request needs an associated documentation update label Sep 11, 2026

susnux removed the pending documentation This pull request needs an associated documentation update label Sep 11, 2026

salmart-dev mentioned this pull request Sep 11, 2026

fix: preserve link shares on ownership transfer #64209

Open

7 tasks

Navigation Menu

Uh oh!

Uh oh!

feat: add IUserFolder similar to IRootFolder - #53048

feat: add IUserFolder similar to IRootFolder#53048
susnux merged 12 commits into
masterfrom
feat/user-folder

susnux commented May 22, 2025 •

edited by come-nc

Loading

Uh oh!

Uh oh!

come-nc commented Dec 16, 2025

Uh oh!

come-nc commented Mar 6, 2026

Uh oh!

come-nc commented Mar 9, 2026

Uh oh!

come-nc commented Mar 11, 2026

Uh oh!

come-nc commented Mar 11, 2026

Uh oh!

susnux commented Sep 2, 2026

Uh oh!

come-nc commented Sep 10, 2026

Uh oh!

Uh oh!

susnux commented Sep 10, 2026

Uh oh!

susnux commented Sep 11, 2026

Uh oh!

salmart-dev commented Sep 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Uh oh!

Uh oh!

Conversation

susnux commented May 22, 2025 • edited by come-nc Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Checklist

Uh oh!

Uh oh!

come-nc commented Dec 16, 2025

Uh oh!

come-nc commented Mar 6, 2026

Uh oh!

come-nc commented Mar 9, 2026

Uh oh!

come-nc commented Mar 11, 2026

Uh oh!

come-nc commented Mar 11, 2026

Uh oh!

susnux commented Sep 2, 2026

Uh oh!

come-nc commented Sep 10, 2026

Uh oh!

Uh oh!

susnux commented Sep 10, 2026

Uh oh!

susnux commented Sep 11, 2026

Uh oh!

salmart-dev commented Sep 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

susnux commented May 22, 2025 •

edited by come-nc

Loading