mod addMetadata

Picker/DocumentPickerViewController.swift

@@ -323,8 +323,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
             }
             
             // Add record
-            //CCCoreData.add(metadata, activeAccount: activeAccount, activeUrl: activeUrl, context: nil)
-            NCManageDatabase.sharedInstance.addMetadata(metadata, activeUrl: activeUrl!)
+            _ = NCManageDatabase.sharedInstance.addMetadata(metadata, activeUrl: activeUrl!)
             
             // if plist do not exists, download it
             if CCUtility.isCryptoPlistString(metadata.fileName) && FileManager.default.fileExists(atPath: "\(directoryUser!)/\(metadata.fileName)") == false {
@@ -461,8 +460,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
             
         case selectorLoadPlist :
             
-            var metadata = NCManageDatabase.sharedInstance.copyTableMetadata(self.metadata!)
-            metadata = CCUtility.insertInformationPlist(metadata, directoryUser: directoryUser)
+            let metadata = CCUtility.insertInformationPlist(self.metadata, directoryUser: directoryUser)!
             
             NCManageDatabase.sharedInstance.updateMetadata(metadata, activeUrl: activeUrl!)
             

iOSClient/Database/NCManageDatabase.swift

@@ -1298,11 +1298,11 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table Metadata
     
-    func addMetadata(_ metadata: tableMetadata, activeUrl: String) {
+    func addMetadata(_ metadata: tableMetadata, activeUrl: String) -> tableMetadata {
         
         let tableAccount = self.getAccountActive()
         if tableAccount == nil {
-            return
+            return metadata
         }
         
         let cameraFolderName = self.getAccountCameraUploadFolderName()
@@ -1322,6 +1322,8 @@ class NCManageDatabase: NSObject {
         }
         
         self.setDateReadDirectory(directoryID: metadata.directoryID)
+        
+        return tableMetadata.init(value: metadata)
     }
     
     func deleteMetadata(predicate: NSPredicate) {
@@ -1626,45 +1628,6 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func copyTableMetadata(_ metadata: tableMetadata) -> tableMetadata {
-        
-        let copyMetadata = tableMetadata()
-        
-        copyMetadata.account = metadata.account
-        copyMetadata.assetLocalIdentifier = metadata.assetLocalIdentifier
-        copyMetadata.cryptated = metadata.cryptated
-        copyMetadata.date = metadata.date
-        copyMetadata.directory = metadata.directory
-        copyMetadata.directoryID = metadata.directoryID
-        copyMetadata.errorPasscode = metadata.errorPasscode
-        copyMetadata.fileID = metadata.fileID
-        copyMetadata.favorite = metadata.favorite
-        copyMetadata.fileName = metadata.fileName
-        copyMetadata.fileNameData = metadata.fileNameData
-        copyMetadata.fileNamePrint = metadata.fileNamePrint
-        copyMetadata.iconName = metadata.iconName
-        copyMetadata.model = metadata.model
-        copyMetadata.nameCurrentDevice = metadata.nameCurrentDevice
-        copyMetadata.permissions = metadata.permissions
-        copyMetadata.protocolCrypto = metadata.protocolCrypto
-        copyMetadata.rev = metadata.rev
-        copyMetadata.session = metadata.session
-        copyMetadata.sessionError = metadata.sessionError
-        copyMetadata.sessionID = metadata.sessionID
-        copyMetadata.sessionSelector = metadata.sessionSelector
-        copyMetadata.sessionSelectorPost = metadata.sessionSelectorPost
-        copyMetadata.sessionTaskIdentifier = metadata.sessionTaskIdentifier
-        copyMetadata.sessionTaskIdentifierPlist = metadata.sessionTaskIdentifierPlist
-        copyMetadata.size = metadata.size
-        copyMetadata.thumbnailExists = metadata.thumbnailExists
-        copyMetadata.title = metadata.title
-        copyMetadata.type = metadata.type
-        copyMetadata.typeFile = metadata.typeFile
-        copyMetadata.uuid = metadata.uuid
-        
-        return copyMetadata
-    }
-    
     func convertMetadataToUnmanagedMetadata(_ metadatas: Results<tableMetadata>) -> [tableMetadata] {
         
         var unmanageMetadatas = [tableMetadata]()

iOSClient/Favorites/CCSynchronize.m

@@ -110,7 +110,7 @@
 
         // Reinsert
         [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@ AND session = ''", metadata.fileID]];
-        [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:app.activeUrl];
+        (void)[[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:app.activeUrl];
         
         // insert for test NOT favorite
         [filesEtag addObject:metadata.fileID];
@@ -274,7 +274,7 @@
                 tableMetadata *result = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadata.fileID]];
 
                 if (!result)
-                    [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:app.activeUrl];
+                    (void)[[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:app.activeUrl];
               
                 // Load if different fileID
                 
@@ -313,7 +313,7 @@
                     tableMetadata *result = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadata.fileID]];
 
                     if (!result)
-                        [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:metadataNet.serverUrl];
+                        (void)[[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:metadataNet.serverUrl];
                 }
             }
         }
@@ -456,7 +456,7 @@
             [[NCManageDatabase sharedInstance] clearDateReadWithServerUrl:serverUrl directoryID:nil];
         }
             
-        [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:serverUrl];
+        (void)[[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:serverUrl];
         
         CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
             

iOSClient/Main/CCMain.m

@@ -1510,7 +1510,6 @@
     // download and view a template
     if ([selector isEqualToString:selectorLoadModelView]) {
         
-        metadata = [[NCManageDatabase sharedInstance] copyTableMetadata:metadata];
         metadata = [CCUtility insertInformationPlist:metadata directoryUser:app.directoryUser];
         [[NCManageDatabase sharedInstance] updateMetadata:metadata activeUrl:app.activeUrl];
         
@@ -1527,7 +1526,6 @@
     //download file plist
     if ([selector isEqualToString:selectorLoadPlist]) {
         
-        metadata = [[NCManageDatabase sharedInstance] copyTableMetadata:metadata];
         metadata = [CCUtility insertInformationPlist:metadata directoryUser:app.directoryUser];
         [[NCManageDatabase sharedInstance] updateMetadata:metadata activeUrl:app.activeUrl];
         
@@ -1890,7 +1888,7 @@
         }
         
         // end test, insert in Database
-        [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:app.activeUrl];
+        (void)[[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:app.activeUrl];
     }
     
     // read plist

iOSClient/Move/CCMove.m

@@ -245,7 +245,6 @@
 
         tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
         
-        metadata = [[NCManageDatabase sharedInstance] copyTableMetadata:metadata];
         metadata = [CCUtility insertInformationPlist:metadata directoryUser:directoryUser];
         [[NCManageDatabase sharedInstance] updateMetadata:metadata activeUrl:activeUrl];
         
@@ -300,7 +299,7 @@
             if (isCryptoComplete == NO) continue;
         }
         
-        [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:activeUrl];
+        (void)[[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:activeUrl];
         
         // if plist do not exists, download it !
         if ([CCUtility isCryptoPlistString:metadata.fileName] && [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", directoryUser, metadata.fileName]] == NO) {

iOSClient/Networking/CCNetworking.m

@@ -878,7 +878,7 @@
     NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderName];
     NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderPathWithActiveUrl:_activeUrl];
     
-    tableMetadata *metadata = [CCUtility insertFileSystemInMetadata:fileName directory:_directoryUser activeAccount:_activeAccount cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath];
+    __block tableMetadata *metadata = [CCUtility insertFileSystemInMetadata:fileName directory:_directoryUser activeAccount:_activeAccount cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath];
     
     //fileID
     NSString *uploadID =  [k_uploadSessionID stringByAppendingString:[CCUtility createRandomString:16]];
@@ -905,7 +905,7 @@
         metadata.typeFile = k_metadataTypeFile_unknown;
         
         //[CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl context:_context];
-        [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:_activeUrl];
+        metadata = [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:_activeUrl];
         
         [self uploadURLSession:fileName fileNamePrint:metadata.fileNamePrint serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetLocalIdentifier:assetLocalIdentifier cryptated:cryptated onlyPlist:onlyPlist selector:selector];
     }
@@ -936,7 +936,7 @@
             metadata.typeFile = k_metadataTypeFile_template;
             
             //[CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl context:_context];
-            [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:_activeUrl];
+            metadata = [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:_activeUrl];
             
             // DATA
             [self uploadURLSession:fileNameCrypto fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetLocalIdentifier:assetLocalIdentifier cryptated:cryptated onlyPlist:onlyPlist selector:selector];
@@ -1042,7 +1042,7 @@
                     if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video])
                         [[CCCrypto sharedManager] addPlistImage:[NSString stringWithFormat:@"%@/%@", _directoryUser, [fileNameCrypto stringByAppendingString:@".plist"]] fileNamePathImage:[NSTemporaryDirectory() stringByAppendingString:uploadID]];
                     
-                    [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:_activeUrl];
+                    metadata = [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:_activeUrl];
                     
                     // DATA
                     [self uploadURLSession:fileNameCrypto fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetLocalIdentifier:assetLocalIdentifier cryptated:cryptated onlyPlist:onlyPlist selector:selector];
@@ -1072,7 +1072,7 @@
                     [[CCCrypto sharedManager] addPlistImage:[NSString stringWithFormat:@"%@/%@", _directoryUser, [fileNameCrypto stringByAppendingString:@".plist"]] fileNamePathImage:[NSTemporaryDirectory() stringByAppendingString:uploadID]];
                 
                 //[CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl context:_context];
-                [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:_activeUrl];
+                metadata = [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:_activeUrl];
                 
                 // DATA
                 [self uploadURLSession:fileNameCrypto fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetLocalIdentifier:assetLocalIdentifier cryptated:cryptated onlyPlist:onlyPlist selector:selector];
@@ -1141,7 +1141,7 @@
                 [CCGraphics createNewImageFrom:metadata.fileNamePrint directoryUser:_directoryUser fileNameTo:metadata.fileID fileNamePrint:metadata.fileNamePrint size:@"m" imageForUpload:YES typeFile:metadata.typeFile writePreview:YES optimizedFileName:NO];
                 
                 //[CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl context:_context];
-                [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:_activeUrl];
+                metadata = [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:_activeUrl];
                 
                 [self uploadURLSession:fileName fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetLocalIdentifier:assetLocalIdentifier cryptated:cryptated onlyPlist:onlyPlist selector:selector];
             }];
@@ -1165,7 +1165,7 @@
             [CCGraphics createNewImageFrom:metadata.fileNamePrint directoryUser:_directoryUser fileNameTo:metadata.fileID fileNamePrint:metadata.fileNamePrint size:@"m" imageForUpload:YES typeFile:metadata.typeFile writePreview:YES optimizedFileName:NO];
 #endif
             //[CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl context:_context];
-            [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:_activeUrl];
+            metadata = [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:_activeUrl];
             
             [self uploadURLSession:fileName fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetLocalIdentifier:assetLocalIdentifier cryptated:cryptated onlyPlist:onlyPlist selector:selector];
         }
@@ -1402,7 +1402,6 @@
         // copy ico in new fileID
         [CCUtility copyFileAtPath:[NSString stringWithFormat:@"%@/%@.ico", _directoryUser, sessionID] toPath:[NSString stringWithFormat:@"%@/%@.ico", _directoryUser, fileID]];
         
-        metadata = [[NCManageDatabase sharedInstance] copyTableMetadata:metadata];
         metadata.fileID = fileID;
         metadata.rev = rev;
         metadata.date = date;
@@ -1411,14 +1410,13 @@
         if ([CCUtility isFileNotCryptated:fileName])
             metadata.sessionTaskIdentifier = k_taskIdentifierDone;
         
-        [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:_activeUrl];
+        metadata = [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:_activeUrl];
         [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", sessionID]];
     }
     
     // CRYPTO
     if ([CCUtility isCryptoString:fileName]) {
         
-        metadata = [[NCManageDatabase sharedInstance] copyTableMetadata:metadata];
         metadata.sessionTaskIdentifier = k_taskIdentifierDone;
         
         [[NCManageDatabase sharedInstance] updateMetadata:metadata activeUrl:_activeUrl];
@@ -1427,7 +1425,6 @@
     // ALL TASK DONE (PLAIN/CRYPTO)
     if (metadata.sessionTaskIdentifier == k_taskIdentifierDone && metadata.sessionTaskIdentifierPlist == k_taskIdentifierDone) {
         
-        metadata = [[NCManageDatabase sharedInstance] copyTableMetadata:metadata];
         
 #ifndef EXTENSION
         if (sessionID)