-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add trashbin:restore occ command #28935
Conversation
b947e25
to
3112412
Compare
Hey, thank you very much for creating this PR and sry for the late answer! |
3112412
to
ff67123
Compare
rebased, fixed code style issues and changed output to be a bit more concise |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
I think this will also potentially: |
765367c
to
3b938a0
Compare
Looks like this is ready to go? |
Looking forward to this going live, but would be nice if it had the option if restoring a specific file based on path or id. |
@Grunthos I think it would be fairly easy to add that in an inelegant way -- restoreDeletedFiles already handles the individual files it restores by $filename, so you could accept an optional input list of filenames to restore, then check for membership. I am sure there is a faster and better way to accomplish this, though. @szaimen as far as I am concerned yes :) |
@cahogan I was just thinking of something based on internal object IDs from the database; in many cases where accidental deletions have occurred they are pretty easy to find. If a path was specifiable, then a wildcard recursive path would be nice ;-). |
/rebase |
seems our bot likely cannot rebase on forks I've retriggered CI to get an up to date result |
Signed-off-by: cahogan <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
3b938a0
to
90cfa31
Compare
I rebased manually. Lets see what CI says |
I think the failures are unrelated. |
Thanks for your first pull request and welcome to the community! Feel free to keep them coming! If you are looking for issues to tackle then have a look at this selection: https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22 |
@cahogan can you update the documentation as well ? https://docs.nextcloud.com/server/stable/admin_manual/configuration_server/occ_command.html?highlight=occ#trashbin-label the repo is here: https://github.com/nextcloud/documentation/tree/master/admin_manual/configuration_server |
@cahogan ping, can you add the docs as per my previous comment ? |
seems the documentation is not yet updated: https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html#trashbin |
Hi all, my apologies -- I didn't receive notifications from this thread. Thank you very much for adding documentation -- is there any additional info that I could help with at this point, or is the PR complete? |
@cahogan it is complete now. thanks! |
Adds feature requested in #18921 and #20781 to allow trashed file restoration with occ.
Close #18921
Close #20781