fix: Handle copy of folders containing live photos by artonge · Pull Request #49293 · nextcloud/server

artonge · 2024-11-14T17:18:07Z

We need to recursively look for live photos in the folder, and then handle them as usual.

Fix#49289
Fix#49307

Need fix: Target the whole data directory in save/restore state command nextcloud-libraries/nextcloud-e2e-test-server#692

kesselb · 2024-11-15T11:13:54Z

getDirectoryListing may return a listing like

a.jpg
a.mov
b.jpg
b.mov

Loop:

handleCopy for a.jpg will copy a.mov too.
handleCopy for a.mov will then copy a.jpg again.

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.

kesselb · 2024-11-21T18:43:08Z

Test cases:

Scenario	Expected	Result (2024-11-21)	Result (2024-12-04)
Copy live photo "a.jpg" to folder where "a.mov" exists	Copy not possible	✅	✅
Copy live photo "a.jpg" to folder where "a.mov" exists (batch action)	Copy not possible	✅	✅
Move live photo "a.jpg" to folder where "a.mov" exists	Move not possible	✅	✅
Move live photo "a.jpg" to folder where "a.mov" exists (batch action)	Move not possible	✅	✅
Copy a folder with live photos (same storage)	Copy possible	❌	✅
Copy a folder with live photos (same storage, batch action)	Copy possible	❌	✅
Copy a folder with live photos (external local to primary s3)	Copy possible	❌	✅
Copy a folder with live photos (external local to primary s3, batch action)	Copy possible	❌	✅
Move a folder with live photos (same storage)	Live photos work after move	✅	✅
Move a folder with live photos (same storage, batch action)	Live photos work after move	✅	✅
Move a folder with live photos (external local to primary s3)	Live photos work after move	✅	✅
Move a folder with live photos (external local to primary s3, batch action)	Live photos work after move	✅	✅

artonge · 2024-12-02T13:27:47Z

/backport to stable30

kesselb · 2024-12-04T14:20:14Z

I've tested "Copying a folder with Live Photos" using desktop client 3.15 (no vfs) with bulkupload.enabled true and false: The metadata is not copied, the live photo state is lost.

bulkupload.enabled	requests
true	mkcol + post for the bulk entpoint
false	mkcol + put for each file in the folder

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>

artonge · 2024-12-04T14:50:03Z

@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.

Signed-off-by: Louis Chemineau <louis@chmn.me>

kesselb · 2024-12-04T15:43:48Z

The peer id for a.jpg was wrong, and therefore the copy operations failed.
It now works as expected.

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.

skjnldsv · 2025-03-06T15:09:08Z

No 29 backport 🤔 ?

kesselb reviewed Nov 14, 2024
View reviewed changes

Comment threadapps/files/lib/Listener/SyncLivePhotosListener.php Outdated

kesselb reviewed Nov 14, 2024
View reviewed changes

Comment threadapps/files/lib/Listener/SyncLivePhotosListener.php Outdated

artonge force-pushed the artonge/fix/handle_folders_copy_live_photos branch 5 times, most recently from 48eee31 to edf6450Compare November 20, 2024 14:27

artonge changed the base branch from master to artonge/chore/update_nc_cypress_beta.11November 20, 2024 14:27

artonge force-pushed the artonge/fix/handle_folders_copy_live_photos branch 2 times, most recently from 5de0228 to c74b1baCompare November 20, 2024 16:38

come-nc reviewed Nov 21, 2024
View reviewed changes

Comment threadapps/dav/lib/Connector/Sabre/Directory.php Outdated

artonge force-pushed the artonge/fix/handle_folders_copy_live_photos branch from c74b1ba to 892349fCompare November 21, 2024 16:54

come-nc approved these changes Nov 21, 2024
View reviewed changes

This comment was marked as resolved.
Sign in to view

kesselb added 2. developing Work in progress feature: live photos labels Nov 21, 2024

This comment was marked as resolved.
Sign in to view

ArtificialOwl approved these changes Nov 25, 2024
View reviewed changes

artonge force-pushed the artonge/chore/update_nc_cypress_beta.11 branch 5 times, most recently from 5966751 to ebda7b4Compare November 25, 2024 15:22

artonge force-pushed the artonge/fix/handle_folders_copy_live_photos branch from 892349f to 5e692daCompare November 25, 2024 16:52

Base automatically changed from artonge/chore/update_nc_cypress_beta.11 to masterNovember 26, 2024 09:17

artonge force-pushed the artonge/fix/handle_folders_copy_live_photos branch 3 times, most recently from 43ed165 to 5b01166Compare November 28, 2024 16:35

artonge force-pushed the artonge/fix/handle_folders_copy_live_photos branch 2 times, most recently from 3568df4 to bafc1e5Compare December 2, 2024 13:03

artonge requested a review from kesselb December 2, 2024 13:27

backportbotBot added the backport-request label Dec 2, 2024

This comment was marked as resolved.
Sign in to view

artonge added 3 commits December 4, 2024 15:38

fix: Correctly create NonExistingFolder during copy
f6c48a4
Signed-off-by: Louis Chemineau <louis@chmn.me>

fix: Handle copy of folders containing live photos
e37664b
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>

test: Copying a folder containing live photos
10c6f70
Signed-off-by: Louis Chemineau <louis@chmn.me>

This comment was marked as resolved.
Sign in to view

This comment was marked as outdated.
Sign in to view

This comment was marked as resolved.
Sign in to view

artonge added 2 commits December 4, 2024 16:23

fix: Copying a live photo to a folder with a conflicting mov file
8be7b9e
Signed-off-by: Louis Chemineau <louis@chmn.me>

fix: Throw exception when copy failed
8be6a7c
Signed-off-by: Louis Chemineau <louis@chmn.me>

artonge force-pushed the artonge/fix/handle_folders_copy_live_photos branch from bafc1e5 to 8be6a7cCompare December 4, 2024 15:23

artonge merged commit 1ef3e3e into masterDec 4, 2024

artonge deleted the artonge/fix/handle_folders_copy_live_photos branch December 4, 2024 16:02

backportbotBot mentioned this pull request Dec 4, 2024
[stable30] fix: Handle copy of folders containing live photos #49650
Merged
2 tasks

backportbotBot removed the backport-request label Dec 4, 2024

skjnldsv mentioned this pull request Jan 7, 2025
31.0.0 beta 1 #50066
Merged

Uh oh!

Uh oh!

Conversation

artonge commented Nov 14, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kesselb commented Nov 15, 2024

Uh oh!

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

kesselb commented Nov 21, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

artonge commented Dec 2, 2024

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

kesselb commented Dec 4, 2024

Uh oh!

artonge commented Dec 4, 2024

Uh oh!

This comment was marked as resolved.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as resolved.

kesselb commented Dec 4, 2024

Uh oh!

skjnldsv commented Mar 6, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

artonge commented Nov 14, 2024•
edited
Loading

kesselb commented Nov 21, 2024•
edited
Loading