drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-08 13:27:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ios] prevent icloud sync from failing when the cloud file doesn't exist

Browse Source 
Issue: https://github.com/organicmaps/organicmaps/issues/10041
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn
2025-06-10 17:23:10 +04:00
committed by Yannik Bloscheck
parent f32462ce94
commit 48353637ac
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
iphone/Maps/Core/iCloud/SynchronizationFileWriter.swift
View File

@@ -74,6 +74,14 @@ final class SynchronizationFileWriter {
let targetLocalFileUrl = cloudMetadataItem.relatedLocalItemUrl(to: localDirectoryUrl)
fileCoordinator.coordinate(readingItemAt: cloudMetadataItem.fileUrl, writingItemAt: targetLocalFileUrl, error: &coordinationError) { readingUrl, writingUrl in
do {
/* During the synchronization process, when the file in trashed by iCloud,
the notification still can contain the already deleted file in the `updated` list instead of `deleted`.
In this case, the file replacement should be skipped. */
guard fileManager.fileExists(atPath: readingUrl.path) else {
LOG(.error, "iCloud file \(readingUrl.lastPathComponent) doesn't exist.")
completion(.failure(SynchronizationError.fileUnavailable))
return
}
try fileManager.replaceFileSafe(at: writingUrl, with: readingUrl)
LOG(.debug, "File \(cloudMetadataItem.fileName) is copied to local directory successfully. Start reloading bookmarks...")
completion(.reloadCategoriesAtURLs([writingUrl]))
@@ -248,7 +256,7 @@ final class SynchronizationFileWriter {
private extension FileManager {
func replaceFileSafe(at targetUrl: URL, with sourceUrl: URL) throws {
guard fileExists(atPath: targetUrl.path) else {
LOG(.info, "Source file \(targetUrl.lastPathComponent) doesn't exist. The file will be copied.")
LOG(.info, "Target file \(targetUrl.lastPathComponent) doesn't exist. The file will be copied.")
try copyItem(at: sourceUrl, to: targetUrl)
return
}