marinofaggiana 4 роки тому
батько
коміт
e0cdaa6f0c

+ 9 - 2
iOSClient/Database/NCManageDatabase.swift

@@ -1726,11 +1726,12 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    @objc func addMetadatas(files: [NCCommunicationFile]?, account: String) {
+    @objc func addMetadatas(files: [NCCommunicationFile]?, account: String) -> [tableMetadata] {
     
-        guard let files = files else { return }
+        guard let files = files else { return [] }
         
         let realm = try! Realm()
+        var directoryMetadata: [tableMetadata] = []
         
         do {
             try realm.safeWrite {
@@ -1778,11 +1779,17 @@ class NCManageDatabase: NSObject {
                     metadata.urlBase = file.urlBase
                     
                     realm.add(metadata, update: .all)
+                    
+                    if metadata.directory {
+                        directoryMetadata.append(tableMetadata.init(value: metadata))
+                    }
                 }
             }
         } catch let error {
             NCCommunicationCommon.shared.writeLog("Could not write to database: \(error)")
         }
+        
+        return directoryMetadata
     }
     
     @objc func deleteMetadata(predicate: NSPredicate) {

+ 9 - 3
iOSClient/Recent/NCRecent.swift

@@ -125,15 +125,21 @@ class NCRecent: NCCollectionViewCommon  {
         </d:searchrequest>
         """
         
-        guard var lessDate = Calendar.current.date(byAdding: .second, value: 1, to: Date()) else { return }
-        let lessDateString = NCCommunicationCommon.shared.convertDate( format: "yyyy-MM-dd'T'HH:mm:ssZZZZZ")
-        let requestBody = String(format: requestBodyRecent, "/files/"+appDelegate.userID)
+        let dateFormatter = DateFormatter()
+        dateFormatter.locale = Locale.init(identifier: "en_US_POSIX")
+        dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZZZZZ"
+        let lessDateString = dateFormatter.string(from: Date())
+        let requestBody = String(format: requestBodyRecent, "/files/"+appDelegate.userID, lessDateString)
         
         isReloadDataSourceNetworkInProgress = true
         collectionView?.reloadData()
         
         NCCommunication.shared.searchBodyRequest(serverUrl: appDelegate.urlBase, requestBody: requestBody, showHiddenFiles: CCUtility.getShowHiddenFiles()) { (account, files, errorCode, errorDescription) in
             
+            let directoryMetadatas = NCManageDatabase.sharedInstance.addMetadatas(files: files, account: account)
+            for metadata in directoryMetadatas {
+            }
+            
             self.refreshControl.endRefreshing()
             self.isReloadDataSourceNetworkInProgress = false
             self.reloadDataSource()