浏览代码

Improvement in Synchronize : RECURSIVE DIRECTORY MODE

Marino Faggiana 6 年之前
父节点
当前提交
5b1861f278
共有 1 个文件被更改,包括 13 次插入11 次删除
  1. 13 11
      iOSClient/Synchronize/CCSynchronize.m

+ 13 - 11
iOSClient/Synchronize/CCSynchronize.m

@@ -170,24 +170,26 @@
             // RECURSIVE DIRECTORY MODE
             if (metadata.directory) {
                 
-                    NSString *serverUrl = [CCUtility stringAppendServerUrl:metadataNet.serverUrl addFileName:metadata.fileName];
-                    NSString *etag = metadata.etag;
+                NSString *serverUrl = [CCUtility stringAppendServerUrl:metadataNet.serverUrl addFileName:metadata.fileName];
+                //NSString *etag = metadata.etag;
                 
-                    // Verify if do not exists this Metadata
-                    tableMetadata *result = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID == %@", metadata.fileID]];
+                // Verify if do not exists this Metadata
+                tableMetadata *result = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID == %@", metadata.fileID]];
 
-                    if (!result)
-                        (void)[[NCManageDatabase sharedInstance] addMetadata:metadata];
+                if (!result)
+                    (void)[[NCManageDatabase sharedInstance] addMetadata:metadata];
               
                     // Load if different etag
-                    tableDirectory *tableDirectory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@", metadataNet.account, serverUrl]];
+                    //tableDirectory *tableDirectory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@", metadataNet.account, serverUrl]];
                 
-                if (![tableDirectory.etag isEqualToString:etag] || [metadataNet.selector isEqualToString:selectorReadFolderWithDownload]) {
+                    //if (![tableDirectory.etag isEqualToString:etag] || [metadataNet.selector isEqualToString:selectorReadFolderWithDownload]) {
                                         
-                        [self readFolder:serverUrl selector:metadataNet.selector];
-                    }
+                    //    [self readFolder:serverUrl selector:metadataNet.selector];
+                    //}
+                
+                [self readFolder:serverUrl selector:metadataNet.selector];
                     
-                } else {
+            } else {
                 
                 if ([metadataNet.selector isEqualToString:selectorReadFolderWithDownload]) {