dev

iOSClient/Main/CCMain.m

@@ -1048,6 +1048,7 @@
 - (void)uploadFileAsset:(NSArray *)assets urls:(NSArray *)urls serverUrl:(NSString *)serverUrl autoUploadPath:(NSString *)autoUploadPath useSubFolder:(BOOL)useSubFolder session:(NSString *)session
 {
     NSMutableArray *metadatas = [NSMutableArray new];
+    NSMutableArray *metadatasMOV = [NSMutableArray new];
     NSMutableArray *metadatasConflict = [NSMutableArray new];
 
     for (PHAsset *asset in assets) {
@@ -1089,8 +1090,6 @@
         metadataForUpload.size = [[NCUtility sharedInstance] getFileSizeWithAsset:asset];
         metadataForUpload.status = k_metadataStatusWaitUpload;
                 
-        [metadatas addObject:metadataForUpload];
-        
         // verify exists conflict
         NSString *fileNameExtension = [fileName pathExtension].lowercaseString;
         NSString *fileNameWithoutExtension = [fileName stringByDeletingPathExtension];
@@ -1102,6 +1101,8 @@
         tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@ AND fileNameView == %@", appDelegate.activeAccount, serverUrl, fileNameConflict]];
         if (metadata) {
             [metadatasConflict addObject:metadata];
+        } else {
+            [metadatas addObject:metadataForUpload];
         }
                     
         // Add Medtadata MOV LIVE PHOTO for upload
@@ -1128,7 +1129,7 @@
             // Prepare file and directory
             [CCUtility copyFileAtPath:url.path toPath:[CCUtility getDirectoryProviderStorageOcId:metadataMOVForUpload.ocId fileNameView:fileName]];
             
-            [metadatas addObject:metadataMOVForUpload];
+            [metadatasMOV addObject:metadataMOVForUpload];
         }
     }
     
@@ -1137,6 +1138,7 @@
         
         NCCreateFormUploadConflict *conflict = [[UIStoryboard storyboardWithName:@"NCCreateFormUploadConflict" bundle:nil] instantiateInitialViewController];
         conflict.metadatas = metadatas;
+        conflict.metadatasMOV = metadatasMOV;
         conflict.metadatasConflict = metadatasConflict;
         
         [self presentViewController:conflict animated:YES completion:nil];
@@ -1144,6 +1146,7 @@
     } else {
         
         (void)[[NCManageDatabase sharedInstance] addMetadatas:metadatas];
+        (void)[[NCManageDatabase sharedInstance] addMetadatas:metadatasMOV];
         
         [appDelegate startLoadAutoDownloadUpload];
         [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:self.serverUrl ocId:nil action:k_action_NULL];

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -42,6 +42,7 @@ import Foundation
     private let appDelegate = UIApplication.shared.delegate as! AppDelegate
     
     @objc var metadatas: [tableMetadata]
+    @objc var metadatasMOV: [tableMetadata]
     @objc var metadatasConflict: [tableMetadata]
     
     var metadatasConflictNewFiles = [String]()
@@ -51,6 +52,7 @@ import Foundation
 
     @objc required init?(coder aDecoder: NSCoder) {
         self.metadatas = [tableMetadata]()
+        self.metadatasMOV = [tableMetadata]()
         self.metadatasConflict = [tableMetadata]()
         super.init(coder: aDecoder)
     }