Use decomposed file names for lookups

Build a decomposed-key map for local files and use Unicode-decomposed keys when matching local and remote file names. Added _localFilesWithDecomposedNames and populated it in the initializer. Replaced direct _localFiles lookups with decomposed-key lookups and normalized local keys before checking _uniqueRemoteFilesWithDecomposedNames. Also updated logging to use the decomposed-key map. This prevents mismatches caused by Unicode normalization differences between local and remote file name representations.

Author: vitaliy-sova-ios

Sources/Backup/OAGenerateBackupInfoTask.m

@@ -19,6 +19,7 @@
 @implementation OAGenerateBackupInfoTask
 {
     NSDictionary<NSString *, OALocalFile *> *_localFiles;
+    NSDictionary<NSString *, OALocalFile *> *_localFilesWithDecomposedNames;
     NSDictionary<NSString *, OARemoteFile *> *_uniqueRemoteFiles;
     NSDictionary<NSString *, OARemoteFile *> *_uniqueRemoteFilesWithDecomposedNames;
     NSDictionary<NSString *, OARemoteFile *> *_deletedRemoteFiles;
@@ -36,6 +37,13 @@ - (instancetype) initWithLocalFiles:(NSDictionary<NSString *, OALocalFile *> *)l
     if (self)
     {
         _localFiles = localFiles;
+        NSMutableDictionary<NSString *, OALocalFile *> *decomposedLocalFiles = [NSMutableDictionary dictionaryWithCapacity:_localFiles.count];
+        for (NSString *originalKey in _localFiles)
+        {
+            NSString *decomposedKey = [originalKey decomposedStringWithCanonicalMapping];
+            decomposedLocalFiles[decomposedKey] = _localFiles[originalKey];
+        }
+        _localFilesWithDecomposedNames = decomposedLocalFiles;
         _uniqueRemoteFiles = uniqueRemoteFiles;
         NSMutableDictionary<NSString *, OARemoteFile *>* localMap = [NSMutableDictionary dictionaryWithCapacity:_uniqueRemoteFiles.count];
         for (NSString *originalKey in _uniqueRemoteFiles)
@@ -88,7 +96,7 @@ - (OABackupInfo *) doInBackground
         if (exportType == nil || ![OAExportSettingsType isTypeEnabled:exportType] || remoteFile.isRecordedVoiceFile)
             continue;
         NSString* decomposedRemoteName = remoteFile.getTypeNamePath.decomposedStringWithCanonicalMapping;
-        OALocalFile *localFile = _localFiles[decomposedRemoteName];
+        OALocalFile *localFile = _localFilesWithDecomposedNames[decomposedRemoteName];
         if (localFile != nil)
         {
             BOOL fileChangedLocally = localFile.localModifiedTime > localFile.uploadTime;
@@ -133,7 +141,8 @@ - (OABackupInfo *) doInBackground
             : nil;
         if (exportType == nil || ![OAExportSettingsType isTypeEnabled:exportType])
             continue;
-        BOOL hasRemoteFile = _uniqueRemoteFilesWithDecomposedNames[localFile.getTypeFileName] != nil;
+        NSString *localKeyNfd = localFile.getTypeFileName.decomposedStringWithCanonicalMapping;
+        BOOL hasRemoteFile = _uniqueRemoteFilesWithDecomposedNames[localKeyNfd] != nil;
         BOOL fileToDelete = [info.localFilesToDelete containsObject:localFile];
         if (!hasRemoteFile && !fileToDelete)
         {
@@ -153,7 +162,7 @@ - (OABackupInfo *) doInBackground
     [_operationLog log:@"=== filesToDownload ==="];
     for (OARemoteFile *remoteFile in info.filesToDownload)
     {
-        OALocalFile *localFile = _localFiles[remoteFile.getTypeNamePath];
+        OALocalFile *localFile = _localFilesWithDecomposedNames[remoteFile.getTypeNamePath.decomposedStringWithCanonicalMapping];
         if (localFile)
             [_operationLog log:[NSString stringWithFormat:@"%@ localUploadTime=%ld", remoteFile.toString, localFile.uploadTime]];
         else