refactor(trash): Port deletion code of Trashbin to node based API - #54278
Open
CarlSchwan wants to merge 1 commit into
Open
refactor(trash): Port deletion code of Trashbin to node based API#54278CarlSchwan wants to merge 1 commit into
CarlSchwan wants to merge 1 commit into
Conversation
CarlSchwan
requested review from
Altahrim,
icewind1991 and
leftybournes
and removed request for
a team
August 6, 2025 13:30
CarlSchwan
force-pushed
the
cleanup-legacy-trash
branch
from
August 6, 2025 13:32
0291ef5 to
9114ebb
Compare
CarlSchwan
changed the title
CarlSchwan
force-pushed
the
cleanup-legacy-trash
branch
2 times, most recently
from
August 6, 2025 14:01
d0be8fd to
299859f
Compare
CarlSchwan
marked this pull request as draft
August 7, 2025 07:13
skjnldsv
added
the
♻️ refactor
Contributor
|
Hello there, We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process. Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6 Thank you for contributing to Nextcloud and we hope to hear from you soon! (If you believe you should not receive this message, you can add yourself to the blocklist.) |
CarlSchwan
force-pushed
the
cleanup-legacy-trash
branch
2 times, most recently
from
September 3, 2025 13:12
0e8f8b3 to
f5294e5
Compare
CarlSchwan
marked this pull request as ready for review
September 3, 2025 13:21
susnux
reviewed
Sep 3, 2025
susnux
added
the
pending documentation
icewind1991
reviewed
Sep 3, 2025
icewind1991
approved these changes
Sep 3, 2025
CarlSchwan
force-pushed
the
cleanup-legacy-trash
branch
2 times, most recently
from
September 3, 2025 14:55
a044d76 to
541b45e
Compare
come-nc
reviewed
Oct 6, 2025
CarlSchwan
force-pushed
the
cleanup-legacy-trash
branch
from
October 6, 2025 14:07
541b45e to
ac029d1
Compare
come-nc
reviewed
Oct 6, 2025
Merged
This was referenced Jan 29, 2026
Merged
Merged
This was referenced Feb 11, 2026
Merged
Merged
Merged
Closed
CarlSchwan
force-pushed
the
cleanup-legacy-trash
branch
2 times, most recently
from
July 1, 2026 10:40
0e56bba to
b1d6386
Compare
susnux
reviewed
Jul 1, 2026
CarlSchwan
force-pushed
the
cleanup-legacy-trash
branch
from
July 9, 2026 14:24
b1d6386 to
0cf8b07
Compare
Instead of using a mix of View and Node based file system manipulation, use the 'new' node based API everywhere. Replace the hooks used in the admin_audit related to the deletion to new typed event that expose the deleted nodes. And remove old calculateSize to get the size of the deleted folder and instead rely on the Node::getSize information. Signed-off-by: Carl Schwan <carlschwan@kde.org>
CarlSchwan
force-pushed
the
cleanup-legacy-trash
branch
from
July 10, 2026 08:11
0cf8b07 to
f4c89a6
Compare
come-nc
reviewed
Jul 13, 2026
| /** | ||
| * Event send before a node is deleted definitively. | ||
| * | ||
| * If you are doing anything with the database, prefer using BeforeAllNodeDeletedEvent instead. |
Contributor
There was a problem hiding this comment.
There is no BeforeAllNodeDeletedEvent for trashbin, is there? If it’s from another namespace put the fully qualified name in the comment.
come-nc
reviewed
Jul 13, 2026
Comment on lines
-755
to
+744
| if ($node instanceof Folder) { | ||
| $size += self::calculateSize(new View('/' . $user . '/files_trashbin/files/' . $file)); | ||
| } elseif ($node instanceof File) { | ||
| $size += $view->filesize('/files_trashbin/files/' . $file); | ||
| } | ||
| $size += $node->getSize(); |
Contributor
There was a problem hiding this comment.
Are there tests for this size calculation that validates it did not change?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Instead of using a mix of View and Node based file system manipulation, use the 'new' node based API everywhere.
Replace the hooks used in the admin_audit related to the deletion to new typed event that expose the deleted nodes.
And remove old calculateSize to get the size of the deleted folder and instead rely on the Node::getSize information.
Checklist