fix(occ): resolve trashed/appdata files in info:file and flag trashed orphan shares - #60838
Open
juliusknorr wants to merge 4 commits into
Open
juliusknorr wants to merge 4 commits into
juliusknorr wants to merge 4 commits into
Conversation
juliusknorr
requested review from
CarlSchwan,
artonge,
icewind1991 and
salmart-dev
and removed request for
a team
May 29, 2026 14:05
juliusknorr
added
enhancement
bug
3. to review
juliusknorr
force-pushed
the
fix/info-file-trashbin
branch
from
June 26, 2026 09:31
23c4ab3 to
270bd6c
Compare
CarlSchwan
approved these changes
Jun 30, 2026
CarlSchwan
reviewed
Jun 30, 2026
| } | ||
|
|
||
| public function isInTrashbin(int $fileId): bool { | ||
| $query = $this->connection->getQueryBuilder(); |
Member
There was a problem hiding this comment.
Just for info, this won't work for groupfolders, but I guess this is fine
Merged
Merged
Merged
The info:file command scoped the file id lookup to the user files folder, so files in the trashbin could not be resolved. Fall back to searching the user root which also covers files_trashbin and files_versions. AI-assistant: Claude Code 2.1.156 (Claude Opus 4.8) Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Signed-off-by: Julius Knorr <jus@bitgrid.net>
Files that are not part of any user mount, such as appdata on the root storage, could not be resolved by id. Fall back to looking the file up directly on the root storage when no user mount matches. AI-assistant: Claude Code 2.1.156 (Claude Opus 4.8) Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Signed-off-by: Julius Knorr <jus@bitgrid.net>
A shared file moved to the trashbin keeps its file id, so it is flagged as an orphan share while still existing in the filecache. Detect this case and tell the admin the file is in the share owner's trashbin instead of the generic lost-access message. AI-assistant: Claude Code 2.1.156 (Claude Opus 4.8) Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Signed-off-by: Julius Knorr <jus@bitgrid.net>
isInTrashbin() only recognizes the regular user trashbin path layout, not the group folders trash storage. Documenting per review feedback on #60838. Signed-off-by: Julius Knorr <jus@bitgrid.net> Assisted-by: ClaudeCode:claude-sonnet-5 Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
juliusknorr
force-pushed
the
fix/info-file-trashbin
branch
from
September 24, 2026 14:38
270bd6c to
ca224da
Compare
This branch has not been deployed
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
4 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
occ info:file <id>returned "file not found" for files that aren't in a user's/filesfolder. This fixes resolution for trashbin, versions, and appdata files, and makessharing:delete-orphan-sharesreport when an orphan's file is in the trashbin.This can be helpful when debugging inaccessible shares and makes it easier to spot for admins how to recover a share where the owner has deleted the file