marinofaggiana 5 년 전
부모
커밋
e5681a6696
2개의 변경된 파일5개의 추가작업 그리고 3개의 파일을 삭제
  1. 4 2
      iOSClient/Database/NCManageDatabase.swift
  2. 1 1
      iOSClient/Media/NCMedia.swift

+ 4 - 2
iOSClient/Database/NCManageDatabase.swift

@@ -1987,7 +1987,7 @@ class NCManageDatabase: NSObject {
         return tableMetadata.init(value: result)
     }
    
-    @objc func getTablesMedia(account: String) -> [tableMetadata]? {
+    @objc func getTablesMedia(account: String, update: Bool) -> [tableMetadata]? {
         
         let realm = try! Realm()
         realm.refresh()
@@ -1995,8 +1995,10 @@ class NCManageDatabase: NSObject {
         let results = realm.objects(tableMedia.self).filter(NSPredicate(format: "account == %@", account)).sorted(byKeyPath: "date", ascending: false)
         if results.count == 0 {
             return nil
+        } else if !update {
+            return Array(results.map { tableMetadata.init(value:$0) })
         }
-    
+        
         let serversUrlLocked = realm.objects(tableDirectory.self).filter(NSPredicate(format: "account == %@ AND lock == true", account)).map { $0.serverUrl } as Array
         
         var metadatas = [tableMetadata]()

+ 1 - 1
iOSClient/Media/NCMedia.swift

@@ -502,7 +502,7 @@ extension NCMedia {
         
         DispatchQueue.global().async {
             
-            let metadatas = NCManageDatabase.sharedInstance.getTablesMedia(account: self.appDelegate.activeAccount)
+            let metadatas = NCManageDatabase.sharedInstance.getTablesMedia(account: self.appDelegate.activeAccount, update: loadNetworkDatasource)
             self.sectionDatasource = CCSectionMetadata.creataDataSourseSectionMetadata(metadatas, listProgressMetadata: nil, groupByField: "date", filterFileID: nil, filterTypeFileImage: self.filterTypeFileImage, filterTypeFileVideo: self.filterTypeFileVideo, sorted: "date", ascending: false, activeAccount: self.appDelegate.activeAccount)
             
             DispatchQueue.main.async {