add new func db for metadata

iOSClient/Database/NCManageDatabase.swift

@@ -1248,14 +1248,14 @@ class NCManageDatabase: NSObject {
         
         let autoUploadFileName = self.getAccountAutoUploadFileName()
         let autoUploadDirectory = self.getAccountAutoUploadDirectory(activeUrl)
-        let directory = NCManageDatabase.sharedInstance.getServerUrl(metadata.directoryID)
+        let serverUrl = NCManageDatabase.sharedInstance.getServerUrl(metadata.directoryID)
         
         let realm = try! Realm()
         
         try! realm.write {
             
             if (metadata.realm == nil) {
-                let metadataWithIcon = CCUtility.insertTypeFileIconName(metadata, directory: directory, autoUploadFileName: autoUploadFileName, autoUploadDirectory: autoUploadDirectory)
+                let metadataWithIcon = CCUtility.insertTypeFileIconName(metadata, serverUrl: serverUrl, autoUploadFileName: autoUploadFileName, autoUploadDirectory: autoUploadDirectory)
                 realm.add(metadataWithIcon!, update: true)
             } else {
                 realm.add(metadata, update: true)
@@ -1279,7 +1279,7 @@ class NCManageDatabase: NSObject {
             for metadata in metadatas {
             
                 if (metadata.realm == nil) {
-                    let metadataWithIcon = CCUtility.insertTypeFileIconName(metadata, directory: serverUrl, autoUploadFileName: autoUploadFileName, autoUploadDirectory: autoUploadDirectory)
+                    let metadataWithIcon = CCUtility.insertTypeFileIconName(metadata, serverUrl: serverUrl, autoUploadFileName: autoUploadFileName, autoUploadDirectory: autoUploadDirectory)
                     realm.add(metadataWithIcon!, update: true)
                 } else {
                     realm.add(metadata, update: true)
@@ -1341,7 +1341,7 @@ class NCManageDatabase: NSObject {
         let autoUploadDirectory = self.getAccountAutoUploadDirectory(activeUrl)
         let serverUrl = self.getServerUrl(metadata.directoryID)
         
-        let metadataWithIcon = CCUtility.insertTypeFileIconName(metadata, directory: serverUrl, autoUploadFileName: autoUploadFileName, autoUploadDirectory: autoUploadDirectory)
+        let metadataWithIcon = CCUtility.insertTypeFileIconName(metadata, serverUrl: serverUrl, autoUploadFileName: autoUploadFileName, autoUploadDirectory: autoUploadDirectory)
         
         let realm = try! Realm()
         

iOSClient/Main/CCMain.m

@@ -1845,6 +1845,7 @@
         _fatherPermission = permissions;
     
     NSArray *recordsInSessions;
+    NSMutableArray *metadatasToInsertInDB = [NSMutableArray new];
     
     if (_isSearchMode) {
         
@@ -1897,10 +1898,13 @@
             }
         }
         
-        // end test, insert in Database
-        (void)[[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:app.activeUrl];
+        // Insert in Array
+        [metadatasToInsertInDB addObject:metadata];
     }
     
+    // insert in Database
+    [[NCManageDatabase sharedInstance] addMetadatas:metadatasToInsertInDB activeUrl:app.activeUrl serverUrl:metadataNet.serverUrl];
+    
     // read plist
     if (!_isSearchMode)
         [self downloadPlist:metadataNet.directoryID serverUrl:metadataNet.serverUrl];

iOSClient/Utility/CCUtility.h

@@ -171,7 +171,7 @@
 
 + (tableMetadata *)insertFileSystemInMetadata:(NSString *)fileName directory:(NSString *)directory activeAccount:(NSString *)activeAccount autoUploadFileName:(NSString *)autoUploadFileName autoUploadDirectory:(NSString *)autoUploadDirectory;
 
-+ (tableMetadata *)insertTypeFileIconName:(tableMetadata *)metadata directory:(NSString *)directory autoUploadFileName:(NSString *)autoUploadFileName autoUploadDirectory:(NSString *)autoUploadDirectory;
++ (tableMetadata *)insertTypeFileIconName:(tableMetadata *)metadata serverUrl:(NSString *)serverUrl autoUploadFileName:(NSString *)autoUploadFileName autoUploadDirectory:(NSString *)autoUploadDirectory;
 
 + (NSString *)trasformedFileNamePlistInCrypto:(NSString *)fileName;
 + (NSString *)trasformedFileNameCryptoInPlist:(NSString *)fileName;

iOSClient/Utility/CCUtility.m

@@ -809,12 +809,12 @@
             break;
     }
     
-    [self insertTypeFileIconName:metadata directory:serverUrl autoUploadFileName:autoUploadFileName autoUploadDirectory:autoUploadDirectory];
+    [self insertTypeFileIconName:metadata serverUrl:serverUrl autoUploadFileName:autoUploadFileName autoUploadDirectory:autoUploadDirectory];
     
     return metadata;
 }
 
-+ (tableMetadata *)insertTypeFileIconName:(tableMetadata *)metadata directory:(NSString *)directory autoUploadFileName:(NSString *)autoUploadFileName autoUploadDirectory:(NSString *)autoUploadDirectory
++ (tableMetadata *)insertTypeFileIconName:(tableMetadata *)metadata serverUrl:(NSString *)serverUrl autoUploadFileName:(NSString *)autoUploadFileName autoUploadDirectory:(NSString *)autoUploadDirectory
 {
     if ([metadata.type isEqualToString: k_metadataType_template]) {
         
@@ -913,7 +913,7 @@
         if (metadata.cryptated) metadata.iconName = @"foldercrypto";
         else metadata.iconName = @"folder";
         
-        if([metadata.fileName isEqualToString:autoUploadFileName] && [directory isEqualToString:autoUploadDirectory])
+        if([metadata.fileName isEqualToString:autoUploadFileName] && [serverUrl isEqualToString:autoUploadDirectory])
             metadata.iconName = @"folderphotocamera";
     }
     
@@ -1044,7 +1044,7 @@
     if ([CCUtility isCryptoPlistString:fileName])
         metadata = [CCUtility insertInformationPlist:metadata directoryUser:directory];
     
-    [self insertTypeFileIconName:metadata directory:directory autoUploadFileName:autoUploadFileName autoUploadDirectory:autoUploadDirectory];
+    [self insertTypeFileIconName:metadata serverUrl:directory autoUploadFileName:autoUploadFileName autoUploadDirectory:autoUploadDirectory];
     
     return metadata;
 }