瀏覽代碼

selectorReadFolderRefresh

Marino Faggiana 8 年之前
父節點
當前提交
9cf0732f01
共有 2 個文件被更改,包括 28 次插入28 次删除
  1. 11 14
      iOSClient/AppDelegate.m
  2. 17 14
      iOSClient/Offline/CCSynchronize.m

+ 11 - 14
iOSClient/AppDelegate.m

@@ -354,14 +354,18 @@
 //
 - (void)applicationInitialized
 {
-    // now
-    dispatch_async(dispatch_get_main_queue(), ^{
-       
-        NSLog(@"[LOG] Listning Favorites");
-        [[CCSynchronize sharedSynchronize] readListingFavorites];
-    });
+    // Execute : now
+    
+    NSLog(@"[LOG] Listning Favorites");
+    [[CCSynchronize sharedSynchronize] readListingFavorites];
+        
+    NSLog(@"[LOG] Update Folder Photo");
+    NSString *folderCameraUpload = [CCCoreData getCameraUploadFolderNamePathActiveAccount:self.activeAccount activeUrl:self.activeUrl];
+    if ([folderCameraUpload length] > 0)
+        [[CCSynchronize sharedSynchronize] readFolderServerUrl:folderCameraUpload directoryID:[CCCoreData getDirectoryIDFromServerUrl:folderCameraUpload activeAccount:self.activeAccount] selector:selectorReadFolderRefresh];
 
-    // after 0.5 sec.
+    // Execute : after 0.5 sec.
+    
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
         
         NSLog(@"[LOG] Request Server Information");
@@ -374,13 +378,6 @@
         
         NSLog(@"[LOG] files Offline");
         [[CCSynchronize sharedSynchronize] readOffline];
-        
-        NSString *folderCameraUpload = [CCCoreData getCameraUploadFolderNamePathActiveAccount:self.activeAccount activeUrl:self.activeUrl];
-        if ([folderCameraUpload length] > 0) {
-            
-            NSLog(@"[LOG] Update Folder Photo");
-            [[CCSynchronize sharedSynchronize] readFolderServerUrl:folderCameraUpload directoryID:[CCCoreData getDirectoryIDFromServerUrl:folderCameraUpload activeAccount:self.activeAccount] selector:selectorReadFolderRefresh];
-        }
     });
     
     // Initialize Camera Upload

+ 17 - 14
iOSClient/Offline/CCSynchronize.m

@@ -288,7 +288,6 @@
             
             if ([metadatasNotPresents count] > 0)
                 [app.activeMain reloadDatasource:metadataNet.serverUrl fileID:nil selector:nil];
-            
         });
         
         // ----- Test : (MODIFY) -----
@@ -302,16 +301,18 @@
             // dir recursive
             if (metadata.directory) {
                 
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    
-                    NSString *serverUrl = [CCUtility stringAppendServerUrl:metadataNet.serverUrl addFileName:metadata.fileNameData];
-                    NSString *directoryID = [CCCoreData getDirectoryIDFromServerUrl:serverUrl activeAccount:app.activeAccount];
-                    
-                    [CCCoreData addMetadata:metadata activeAccount:app.activeAccount activeUrl:app.activeUrl context:nil];
+                NSString *serverUrl = [CCUtility stringAppendServerUrl:metadataNet.serverUrl addFileName:metadata.fileNameData];
+                NSString *directoryID = [CCCoreData getDirectoryIDFromServerUrl:serverUrl activeAccount:app.activeAccount];
                     
-                    [self readFolderServerUrl:serverUrl directoryID:directoryID selector:metadataNet.selector];
+                // Verify if do not exists this Metadata
+                if (![CCCoreData getTableMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(account == %@) AND (fileID == %@)", metadataNet.account, metadata.fileID]]) {
                     
-                });
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        [CCCoreData addMetadata:metadata activeAccount:app.activeAccount activeUrl:app.activeUrl context:nil];
+                    });
+                }
+              
+                [self readFolderServerUrl:serverUrl directoryID:directoryID selector:metadataNet.selector];
                 
             } else {
             
@@ -334,12 +335,14 @@
                 }
                 
                 if ([metadataNet.selector isEqualToString:selectorReadFolderRefresh]) {
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        
-                        // Verify if do not exists this Metadata
-                        if (![CCCoreData getTableMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(account == %@) AND (fileID == %@)", metadataNet.account, metadata.fileID]])
+                    
+                    // Verify if do not exists this Metadata
+                    if (![CCCoreData getTableMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(account == %@) AND (fileID == %@)", metadataNet.account, metadata.fileID]]) {
+                    
+                        dispatch_async(dispatch_get_main_queue(), ^{
                             [CCCoreData addMetadata:metadata activeAccount:metadataNet.account activeUrl:metadataNet.serverUrl context:nil];
-                    });
+                        });
+                    }
                 }
             }
         }