浏览代码

add routine synchronized photo directory [TEST]

Marino Faggiana 8 年之前
父节点
当前提交
acee817b85
共有 4 个文件被更改,包括 15 次插入5 次删除
  1. 6 0
      iOSClient/AppDelegate.m
  2. 0 2
      iOSClient/Main/CCMain.m
  3. 3 3
      iOSClient/Networking/OCNetworking.m
  4. 6 0
      iOSClient/Offline/CCSynchronize.m

+ 6 - 0
iOSClient/AppDelegate.m

@@ -375,6 +375,12 @@
         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

+ 0 - 2
iOSClient/Main/CCMain.m

@@ -4183,8 +4183,6 @@
         NSString *cameraUploadFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:app.activeAccount];
         NSString *cameraUploadFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
         
-        
-        
         [actionSheet addButtonWithTitle: _metadata.fileNamePrint
                                   image: iconHeader
                         backgroundColor: COLOR_BACKGROUND_MENU

+ 3 - 3
iOSClient/Networking/OCNetworking.m

@@ -380,7 +380,7 @@
                     [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:_metadataNet.serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser]];
                 }
                 
-                if ([_metadataNet.selector isEqualToString:selectorReadFolder]) {
+                if ([_metadataNet.selector containsString:selectorReadFolder]) {
                     
                     [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:_metadataNet.serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser]];
                 }
@@ -388,7 +388,7 @@
             
             dispatch_async(dispatch_get_main_queue(), ^{
                 
-                if ([_metadataNet.selector isEqualToString:selectorReadFolder] && [self.delegate respondsToSelector:@selector(readFolderSuccess:permissions:metadatas:)])
+                if ([_metadataNet.selector containsString:selectorReadFolder] && [self.delegate respondsToSelector:@selector(readFolderSuccess:permissions:metadatas:)])
                     [self.delegate readFolderSuccess:_metadataNet permissions:permissions metadatas:metadatas];
 
                 if ([_metadataNet.selector isEqualToString:selectorSearch] && [self.delegate respondsToSelector:@selector(searchSuccess:metadatas:)])
@@ -405,7 +405,7 @@
         if (errorCode == 0)
             errorCode = error.code;
         
-        if ([_metadataNet.selector isEqualToString:selectorReadFolder] && [self.delegate respondsToSelector:@selector(readFolderFailure:message:errorCode:)])
+        if ([_metadataNet.selector containsString:selectorReadFolder] && [self.delegate respondsToSelector:@selector(readFolderFailure:message:errorCode:)])
             [self.delegate readFolderFailure:_metadataNet message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
         
         if ([_metadataNet.selector isEqualToString:selectorSearch] && [self.delegate respondsToSelector:@selector(searchFailure:message:errorCode:)])

+ 6 - 0
iOSClient/Offline/CCSynchronize.m

@@ -332,6 +332,12 @@
                     // Ohhhh INSERT
                     [metadatasForVerifyChange addObject:metadata];
                 }
+                
+                if ([metadataNet.selector isEqualToString:selectorReadFolderRefresh]) {
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        [CCCoreData addMetadata:metadata activeAccount:app.activeAccount activeUrl:metadataNet.serverUrl context:nil];
+                    });
+                }
             }
         }