-
-
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
fix: Handle copy of folders containing live photos #49293
Conversation
getDirectoryListing may return a listing like
Loop:
It would be nice to skip the copy process for a.mov and a.jpg for the second execution if that's possible without making the whole logic much more complex. |
48eee31
to
edf6450
Compare
5de0228
to
c74b1ba
Compare
c74b1ba
to
892349f
Compare
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
Test cases:
|
5966751
to
ebda7b4
Compare
892349f
to
5e692da
Compare
43ed165
to
5b01166
Compare
3568df4
to
bafc1e5
Compare
/backport to stable30 |
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
I've tested "Copying a folder with Live Photos" using desktop client 3.15 (no vfs) with
|
Signed-off-by: Louis Chemineau <louis@chmn.me>
We need to recursively look for live photos in the folder, and then handle them as usual. Signed-off-by: Louis Chemineau <louis@chmn.me>
Signed-off-by: Louis Chemineau <louis@chmn.me>
@kesselb I was not able to reproduce all of your failed scenario. Can you make sure that you pulled the latest version of the PR? Regarding the Desktop client behavior, please see with a desktop engineer. |
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as resolved.
This comment was marked as resolved.
Signed-off-by: Louis Chemineau <louis@chmn.me>
Signed-off-by: Louis Chemineau <louis@chmn.me>
bafc1e5
to
8be6a7c
Compare
The peer id for a.jpg was wrong, and therefore the copy operations failed. The situation with Nautilus is not ideal. Copying a folder sends a mkcol request and then a copy request for each file. The user is then asked if a.mov should be replaced because a.mov was already copied with a.jpg. Similar case for deleting a folder with live photos, a delete request is sent for each child and Nautilus show's a warning that a.mov is not found. |
We need to recursively look for live photos in the folder, and then handle them as usual.
Fix #49289
Fix #49307