coding

iOSClient/CCGlobal.h

@@ -164,6 +164,7 @@
 #define k_minCharsSearch                                2
 
 // Selector
+#define selectorSynchronize                             @"synchronize"
 #define selectorDownloadSynchronize                     @"downloadSynchronize"
 #define selectorLoadFileView                            @"loadFileView"
 #define selectorLoadFileViewFavorite                    @"loadFileViewFavorite"
@@ -172,10 +173,6 @@
 #define selectorLoadOffline                             @"loadOffline"
 #define selectorOpenIn                                  @"openIn"
 #define selectorOpenInDetail                            @"openInDetail"
-#define selectorReadFile                                @"readFile"
-#define selectorReadFileWithDownload                    @"readFileWithDownload"
-#define selectorReadFolder                              @"readFolder"
-#define selectorReadFolderWithDownload                  @"readFolderWithDownload"
 #define selectorSave                                    @"save"
 #define selectorUploadAutoUpload                        @"uploadAutoUpload"
 #define selectorUploadAutoUploadAll                     @"uploadAutoUploadAll"

iOSClient/Favorites/CCFavorites.m

@@ -191,16 +191,10 @@
                     NSString *serverUrl = metadata.serverUrl;
                     NSString *serverUrlSon = [CCUtility stringAppendServerUrl:serverUrl addFileName:metadata.fileName];
                     if (![serverUrlSon containsString:father]) {
-                        if (metadata.directory) {
-//                            if ([CCUtility getFavoriteOffline])
-//                                [[CCSynchronize sharedSynchronize] readFolder:[CCUtility stringAppendServerUrl:serverUrl addFileName:metadata.fileName] selector:selectorReadFolderWithDownload account:account];
-//                            else
-//                                [[CCSynchronize sharedSynchronize] readFolder:[CCUtility stringAppendServerUrl:serverUrl addFileName:metadata.fileName] selector:selectorReadFolder account:account];
+                        if ([CCUtility getFavoriteOffline]) {
+                            [[NCOperationQueue shared] synchronizationMetadata:metadata selector:selectorDownloadSynchronize];
                         } else {
-//                            if ([CCUtility getFavoriteOffline])
-//                                [[CCSynchronize sharedSynchronize] readFile:metadata.ocId fileName:metadata.fileName serverUrl:serverUrl selector:selectorReadFileWithDownload account:account];
-//                            else
-//                                [[CCSynchronize sharedSynchronize] readFile:metadata.ocId fileName:metadata.fileName serverUrl:serverUrl selector:selectorReadFile account:account];
+                            [[NCOperationQueue shared] synchronizationMetadata:metadata selector:selectorSynchronize];
                         }
                         father = serverUrlSon;
                     }

iOSClient/Main/CCMain.m

@@ -527,11 +527,9 @@
             NSString *selector;
                        
             if ([CCUtility getFavoriteOffline])
-                selector = selectorReadFolderWithDownload;
+                [[NCOperationQueue shared] synchronizationMetadata:metadata selector:selectorDownloadSynchronize];
             else
-                selector = selectorReadFolder;
-                  
-            [[NCOperationQueue shared] synchronizationMetadata:metadata selector:selector];
+                [[NCOperationQueue shared] synchronizationMetadata:metadata selector:selectorSynchronize];
         }
                    
         if (!metadata.directory && favorite && [CCUtility getFavoriteOffline]) {
@@ -964,15 +962,7 @@
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.3 * NSEC_PER_SEC), dispatch_get_main_queue(), ^(void) {
         
         for (tableMetadata *metadata in selectedMetadatas) {
-            
-            if (metadata.directory) {
-                
-//                [[CCSynchronize sharedSynchronize] readFolder:[CCUtility stringAppendServerUrl:metadata.serverUrl addFileName:metadata.fileName] selector:selectorReadFolderWithDownload account:appDelegate.activeAccount];
-                    
-            } else {
-                
-//                [[CCSynchronize sharedSynchronize] readFile:metadata.ocId fileName:metadata.fileName serverUrl:metadata.serverUrl selector:selectorReadFileWithDownload account:appDelegate.activeAccount];
-            }
+            [[NCOperationQueue shared] synchronizationMetadata:metadata selector:selectorDownloadSynchronize];
         }
         
         [_hud hideHud];

iOSClient/Main/Menu/CCMain+Menu.swift

@@ -323,7 +323,7 @@ extension CCMain {
                             let serverUrl = CCUtility.stringAppendServerUrl(metadata.serverUrl, addFileName: metadata.fileName)!
                             NCManageDatabase.sharedInstance.setDirectory(serverUrl: serverUrl, offline: !isOffline, account: appDelegate.activeAccount)
                             if (!isOffline) {
-                                //CCSynchronize.shared()?.readFolder(serverUrl, selector: selectorReadFolderWithDownload, account: appDelegate.activeAccount)
+                                NCOperationQueue.shared.synchronizationMetadata(metadata, selector: selectorDownloadSynchronize)
                             }
                             NotificationCenter.default.postOnMainThread(name: k_notificationCenter_reloadDataSource, userInfo: ["ocId":metadata.ocId, "serverUrl":metadata.serverUrl])
                         }

iOSClient/Networking/NCOperationQueue.swift

@@ -187,7 +187,7 @@ class NCOperationSynchronization: ConcurrentOperation {
                 serverUrlFileName = metadata.serverUrl + "/" + metadata.fileName
                 predicate = NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileName == %@", metadata.account, metadata.serverUrl, metadata.fileName)
             }
-            if selector == selectorReadFolderWithDownload {
+            if selector == selectorDownloadSynchronize {
                 download = true
             }
             

iOSClient/Networking/NCService.swift

@@ -83,7 +83,7 @@ class NCService: NSObject {
                         guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "ocId == %@", file.ocId)) else {
                             continue
                         }
-                        //CCSynchronize.shared()?.readFile(metadata.ocId, fileName: metadata.fileName, serverUrl: metadata.serverUrl, selector: selectorReadFileWithDownload, account: tableAccount.account)
+                        NCOperationQueue.shared.synchronizationMetadata(metadata, selector: selectorDownloadSynchronize)
                     }
                 }