瀏覽代碼

Improvement db

Marino Faggiana 7 年之前
父節點
當前提交
0a6761ff3d
共有 1 個文件被更改,包括 4 次插入6 次删除
  1. 4 6
      iOSClient/Database/NCManageDatabase.swift

+ 4 - 6
iOSClient/Database/NCManageDatabase.swift

@@ -1786,12 +1786,10 @@ class NCManageDatabase: NSObject {
         
         var recordsPhotosAutoUpload = [tableMetadata]()
         
-        let results = realm.objects(tableDirectory.self).filter(NSPredicate(format: "account = %@ AND serverUrl BEGINSWITH %@", tableAccount.account, serverUrl)).sorted(byKeyPath: "serverUrl", ascending: true)
-        let directoriesID = Array(results.map { $0.directoryID })
-
-        let predicate = NSPredicate(format: "account = %@ AND session = '' AND type = 'file' AND (typeFile = %@ OR typeFile = %@) AND directoryID IN %@", tableAccount.account, k_metadataTypeFile_image, k_metadataTypeFile_video, directoriesID)
-            
-        let metadatas = realm.objects(tableMetadata.self).filter(predicate).sorted(byKeyPath: "date", ascending: false)
+        let directories = realm.objects(tableDirectory.self).filter(NSPredicate(format: "account = %@ AND serverUrl BEGINSWITH %@", tableAccount.account, serverUrl)).sorted(byKeyPath: "serverUrl", ascending: true)
+        let directoriesID = Array(directories.map { $0.directoryID })
+        
+        let metadatas = realm.objects(tableMetadata.self).filter(NSPredicate(format: "account = %@ AND session = '' AND type = 'file' AND (typeFile = %@ OR typeFile = %@) AND directoryID IN %@", tableAccount.account, k_metadataTypeFile_image, k_metadataTypeFile_video, directoriesID)).sorted(byKeyPath: "date", ascending: false)
             
         // Convert results in unmanaged
         for metadata in metadatas {