feat(trash_sync): do not restore assets deleted locally only #24218
+8,562
−12
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.
Description
Problem
The current implementation of trash sync and restore does not distinguish between assets deleted in different ways — Move to trash, Delete, or Delete from device.
This may lead to incorrect restoration of an asset from the trash, which users perceive as the file being re-uploaded again.
Solution
A flag has been added to the local table to differentiate assets moved to the remote trash from those deleted locally, which do not require restoration.
Only assets that have the corresponding flag are restored.
Fixes #24124
How Has This Been Tested?
Checklist:
src/services/uses repositories implementations for database calls, filesystem operations, etc.src/repositories/is pretty basic/simple and does not have any immich specific logic (that belongs insrc/services/)...