pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] [icloud] skip file recreaion during the update event from the icloud

Browse source 
When the user deletes the file locally with the enabled icloud happens this:
1. the file is moved to the local .Trash dir
2. the LocalDirectoryMonitor send event to delete the file from the iCloud
3. the SynchronizationFileWriter trash the remote file using the system API `try fileManager.trashItem`
4. the file is moved to the devices trash
5. the icloud sends the update to the metadataQery's `queryDidUpdate` with the updated state. This update is tricky - it calls the method twice: on the first call the deleted file appears in the updated list (`userInfo[NSMetadataQueryUpdateChangedItemsKey]`) and on the second call the deleted file appears in the deleted list (`userInfo[NSMetadataQueryUpdateRemovedItemsKey]`). There is no way to disable this behaviour.
At that point the bug can happens: the 1st `update` (that contains the file in the deleted list) call can triggers the file recreation because the synchroisztion starts to process the event and make an attempt to recreate the file but it is already deleted.

The fix is: skip missed file during the `Update` event. The case when the missed file is in the updated in undefined and should be skipped by checking the file existence.

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2025-01-15 19:27:58 +04:00 • committed by Kiryl Kaveryn
parent eef41a9964
commit 79b4826859
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
iphone/Maps/Core/iCloud/CloudDirectoryMonitor.swift
View file

@ -217,7 +217,18 @@ private extension iCloudDocumentsMonitor {
let updatedMetadataItems = userInfo[NSMetadataQueryUpdateChangedItemsKey] as? [NSMetadataItem] ?? []
let removedMetadataItems = userInfo[NSMetadataQueryUpdateRemovedItemsKey] as? [NSMetadataItem] ?? []
let addedContents = try addedMetadataItems.map { try CloudMetadataItem(metadataItem: $0) }
let updatedContents = try updatedMetadataItems.map { try CloudMetadataItem(metadataItem: $0) }
let updatedContents = try updatedMetadataItems.map { try CloudMetadataItem(metadataItem: $0) }.filter { item in
/* During the file deletion from the iCloud the file may be marked as `downloaded` by the system
but doesn't exist because it is already deleted to the trash.
This file will appear in the `deleted` list in the next notification.
Such files should be skipped to avoid unnecessary updates and unexpected behavior.
See https://github.com/organicmaps/organicmaps/pull/10070 for details. */
if item.isDownloaded && !FileManager.default.fileExists(atPath: item.fileUrl.path) {
LOG(.warning, "Skip the update of the file that doesn't exist in the file system: \(item.fileUrl)")
return false
}
return true
}
let removedContents = try removedMetadataItems.map { try CloudMetadataItem(metadataItem: $0) }
return CloudContentsUpdate(added: addedContents, updated: updatedContents, removed: removedContents)
}