Ver código fonte

Change name function Synchronize

Marino Faggiana 7 anos atrás
pai
commit
463d6c4962

+ 1 - 1
iOSClient/AppDelegate.m

@@ -329,7 +329,7 @@
         NSString *fileName = [[NCManageDatabase sharedInstance] getAccountAutoUploadFileName];
         NSString *serverUrl = [[NCManageDatabase sharedInstance] getAccountAutoUploadDirectory:_activeUrl];
         
-        [[CCSynchronize sharedSynchronize] synchronizedFile:fileName serverUrl:serverUrl selector:selectorReadFileFolder];        
+        [[CCSynchronize sharedSynchronize] readFileForFolder:fileName serverUrl:serverUrl selector:selectorReadFileFolder];        
     }
     
     // Execute : after 1 sec.

+ 4 - 4
iOSClient/Favorites/CCFavorites.m

@@ -257,16 +257,16 @@
             if (metadata.directory) {
                 
                 if ([CCUtility getFavoriteOffline])
-                    [[CCSynchronize sharedSynchronize] synchronizedFile:metadata.fileNameData serverUrl:serverUrl selector:selectorReadFileFolderWithDownload];
+                    [[CCSynchronize sharedSynchronize] readFileForFolder:metadata.fileNameData serverUrl:serverUrl selector:selectorReadFileFolderWithDownload];
                 else
-                    [[CCSynchronize sharedSynchronize] synchronizedFile:metadata.fileNameData serverUrl:serverUrl selector:selectorReadFileFolder];
+                    [[CCSynchronize sharedSynchronize] readFileForFolder:metadata.fileNameData serverUrl:serverUrl selector:selectorReadFileFolder];
 
             } else {
                 
                 if ([CCUtility getFavoriteOffline])
-                    [[CCSynchronize sharedSynchronize] synchronizedFile:metadata selector:selectorReadFileWithDownload];
+                    [[CCSynchronize sharedSynchronize] readFile:metadata selector:selectorReadFileWithDownload];
                 else
-                    [[CCSynchronize sharedSynchronize] synchronizedFile:metadata selector:selectorReadFile];
+                    [[CCSynchronize sharedSynchronize] readFile:metadata selector:selectorReadFile];
             }
             
             father = serverUrlSon;

+ 5 - 4
iOSClient/Main/CCMain.m

@@ -1585,12 +1585,12 @@
                     
                     if (serverUrl) {
                         serverUrl = [CCUtility stringAppendServerUrl:serverUrl addFileName:metadata.fileName];
-                        [[CCSynchronize sharedSynchronize] synchronizedFolder:serverUrl selector:selectorReadFolderWithDownload];
+                        [[CCSynchronize sharedSynchronize] readFolder:serverUrl selector:selectorReadFolderWithDownload];
                     }
                     
                 } else {
                     
-                    [[CCSynchronize sharedSynchronize] synchronizedFile:metadata selector:selectorReadFileWithDownload];
+                    [[CCSynchronize sharedSynchronize] readFile:metadata selector:selectorReadFileWithDownload];
                 }
             }
         }
@@ -4451,8 +4451,9 @@
                                         
                                         NSLog(@"[LOG] Update Folder Photo");
                                         NSString *autoUploadPath = [[NCManageDatabase sharedInstance] getAccountAutoUploadPath:app.activeUrl];
-                                        if ([autoUploadPath length] > 0)
-                                            [[CCSynchronize sharedSynchronize] synchronizedFolder:autoUploadPath selector:selectorReadFolder];
+                                        if ([autoUploadPath length] > 0) {
+                                            [[CCSynchronize sharedSynchronize] readFileForFolder:_metadata.fileName serverUrl:serverUrl selector:selectorReadFileFolder];
+                                        }
                                     }];
         }
         

+ 3 - 3
iOSClient/Synchronize/CCSynchronize.h

@@ -36,9 +36,9 @@
 
 @property (nonatomic, strong) NSMutableOrderedSet *foldersInSynchronized;
 
-- (void)synchronizedFolder:(NSString *)serverUrl selector:(NSString *)selector;
-- (void)synchronizedFile:(NSString *)fileName serverUrl:(NSString *)serverUrl selector:(NSString *)selector;
-- (void)synchronizedFile:(tableMetadata *)metadata selector:(NSString *)selector;
+- (void)readFolder:(NSString *)serverUrl selector:(NSString *)selector;
+- (void)readFileForFolder:(NSString *)fileName serverUrl:(NSString *)serverUrl selector:(NSString *)selector;
+- (void)readFile:(tableMetadata *)metadata selector:(NSString *)selector;
 
 - (void)verifyChangeMedatas:(NSArray *)allRecordMetadatas serverUrl:(NSString *)serverUrl account:(NSString *)account withDownload:(BOOL)withDownload;
 

+ 7 - 7
iOSClient/Synchronize/CCSynchronize.m

@@ -59,7 +59,7 @@
 // selector     : selectorReadFolder, selectorReadFolderWithDownload
 //
 
-- (void)synchronizedFolder:(NSString *)serverUrl selector:(NSString *)selector
+- (void)readFolder:(NSString *)serverUrl selector:(NSString *)selector
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
     
@@ -187,7 +187,7 @@
                 
                 if (![tableDirectory.etag isEqualToString:etag] || [metadataNet.selector isEqualToString:selectorReadFolderWithDownload]) {
                                         
-                        [self synchronizedFolder:serverUrl selector:metadataNet.selector];
+                        [self readFolder:serverUrl selector:metadataNet.selector];
                     }
                     
                 } else {
@@ -230,10 +230,10 @@
 }
 
 #pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Read File =====
+#pragma mark ===== Read File for Folder & Read File=====
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)synchronizedFile:(NSString *)fileName serverUrl:(NSString *)serverUrl selector:(NSString *)selector
+- (void)readFileForFolder:(NSString *)fileName serverUrl:(NSString *)serverUrl selector:(NSString *)selector
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
     
@@ -246,7 +246,7 @@
     [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
 }
 
-- (void)synchronizedFile:(tableMetadata *)metadata selector:(NSString *)selector
+- (void)readFile:(tableMetadata *)metadata selector:(NSString *)selector
 {
     NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
     if (!serverUrl) return;
@@ -315,9 +315,9 @@
             if (![tableDirectory.etag isEqualToString:metadata.etag] && tableDirectory) {
                 
                 if ([metadataNet.selector isEqualToString:selectorReadFileFolder])
-                    [self synchronizedFolder:serverUrl selector:selectorReadFolder];
+                    [self readFolder:serverUrl selector:selectorReadFolder];
                 if ([metadataNet.selector isEqualToString:selectorReadFileFolderWithDownload])
-                    [self synchronizedFolder:serverUrl selector:selectorReadFolderWithDownload];
+                    [self readFolder:serverUrl selector:selectorReadFolderWithDownload];
             }
         }
     });