Marino Faggiana 6 лет назад
Родитель
Сommit
f78576e34b
2 измененных файлов с 8 добавлено и 17 удалено
  1. 0 1
      iOSClient/Favorites/CCFavorites.m
  2. 8 16
      iOSClient/Synchronize/CCSynchronize.m

+ 0 - 1
iOSClient/Favorites/CCFavorites.m

@@ -319,7 +319,6 @@
         
         if ([_metadata.typeFile isEqualToString: k_metadataTypeFile_compress]) {
             
-            //[self performSelector:@selector(unZipFile:) withObject:_metadata.fileID];
             [self openWith:_metadata];
             
         } else if ([_metadata.typeFile isEqualToString: k_metadataTypeFile_unknown]) {

+ 8 - 16
iOSClient/Synchronize/CCSynchronize.m

@@ -371,17 +371,11 @@
 // MULTI THREAD
 - (void)SynchronizeMetadatas:(NSArray *)metadatas withDownload:(BOOL)withDownload
 {
-    NSString *oldDirectoryID, *serverUrl, *fileID;
+    NSString *oldDirectoryID, *serverUrl;
     NSMutableArray *metadataToAdd = [NSMutableArray new];
-    NSMutableArray *metadataNetToAdd = [NSMutableArray new];
 
     for (tableMetadata *metadata in metadatas) {
         
-        NSString *selector, *selectorPost;
-        CCMetadataNet *metadataNet = [CCMetadataNet new];
-        
-        selector = selectorDownloadSynchronize;
-        
         // Clear date for dorce refresh view
         if (![oldDirectoryID isEqualToString:metadata.directoryID]) {
             serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
@@ -391,19 +385,17 @@
             [[NCManageDatabase sharedInstance] clearDateReadWithServerUrl:serverUrl directoryID:nil];
         }
         
-        fileID = metadata.fileID;
+        metadata.session = k_download_session;
+        metadata.sessionError = @"";
+        metadata.sessionSelector = selectorDownloadSynchronize;
+        metadata.sessionSelectorPost = @"";
+        metadata.status = k_metadataStatusWaitDownload;
+        
         [metadataToAdd addObject:metadata];
-       
-        metadataNet.fileID = fileID;
-        metadataNet.selector = selector;
-        metadataNet.selectorPost = selectorPost;
-        metadataNet.serverUrl = serverUrl;
-        metadataNet.session = k_download_session;
-        [metadataNetToAdd addObject:metadataNet];
     }
     
     (void)[[NCManageDatabase sharedInstance] addMetadatas:metadataToAdd serverUrl:nil];
-//    [[NCManageDatabase sharedInstance] addQueueDownloadWithMetadatasNet:metadataNetToAdd];
+    [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
     
     dispatch_async(dispatch_get_main_queue(), ^{
         [appDelegate.activeMain reloadDatasource:serverUrl];