浏览代码

Improved code

Marino Faggiana 7 年之前
父节点
当前提交
688ad50d61
共有 1 个文件被更改,包括 2 次插入15 次删除
  1. 2 15
      iOSClient/Database/NCManageDatabase.swift

+ 2 - 15
iOSClient/Database/NCManageDatabase.swift

@@ -1388,25 +1388,12 @@ class NCManageDatabase: NSObject {
     
     func addMetadatas(_ metadatas: [tableMetadata], activeUrl: String, serverUrl: String) -> [tableMetadata] {
         
-        let autoUploadFileName = self.getAccountAutoUploadFileName()
-        let autoUploadDirectory = self.getAccountAutoUploadDirectory(activeUrl)
-        var arrayMetadatas = [tableMetadata]()
-        
         let realm = try! Realm()
         
         do {
             try realm.write {
-                
                 for metadata in metadatas {
-                    
-                    if metadata.realm == nil {
-                        let metadataWithIcon = CCUtility.insertTypeFileIconName(metadata, serverUrl: serverUrl, autoUploadFileName: autoUploadFileName, autoUploadDirectory: autoUploadDirectory)
-                        realm.add(metadataWithIcon!, update: true)
-                    } else {
-                        realm.add(metadata, update: true)
-                    }
-                    
-                    arrayMetadatas.append(tableMetadata.init(value: metadata))
+                    realm.add(metadata, update: true)
                 }
             }
         } catch let error {
@@ -1416,7 +1403,7 @@ class NCManageDatabase: NSObject {
         let directoryID = self.getDirectoryID(serverUrl)
         self.setDateReadDirectory(directoryID: directoryID)
         
-        return arrayMetadatas
+        return Array(metadatas.map { tableMetadata.init(value:$0) })
     }
 
     func deleteMetadata(predicate: NSPredicate, clearDateReadDirectoryID: String?) {