marinofaggiana 4 years ago
parent
commit
3b70f73f20
2 changed files with 13 additions and 14 deletions
  1. 2 2
      iOSClient/Database/NCManageDatabase.swift
  2. 11 12
      iOSClient/Media/NCMedia.swift

+ 2 - 2
iOSClient/Database/NCManageDatabase.swift

@@ -672,14 +672,14 @@ class NCManageDatabase: NSObject {
     }
     #endif
     
-    @objc func setAccountDateUpdateMedia(_ date: NSDate) {
+    @objc func setAccountDateUpdateMedia() {
         
         let realm = try! Realm()
 
         do {
             try realm.write {
                 if let result = realm.objects(tableAccount.self).filter("active == true").first {
-                        result.dateUpdateMedia = date
+                        result.dateUpdateMedia = Date() as NSDate
                 }
             }
         } catch let error {

+ 11 - 12
iOSClient/Media/NCMedia.swift

@@ -180,9 +180,6 @@ class NCMedia: UIViewController, DropdownMenuDelegate, DZNEmptyDataSetSource, DZ
         
         // Title
         self.navigationItem.title = NSLocalizedString("_media_", comment: "")
-                
-        // Reload Data Source
-        self.reloadDataSource(loadNetworkDatasource: true) { }
     }
     
     override func viewDidAppear(_ animated: Bool) {
@@ -641,21 +638,23 @@ extension NCMedia {
         
         let tableAccount = NCManageDatabase.sharedInstance.getAccountActive()
         let fromDate = tableAccount?.dateUpdateMedia
-        if fromDate == nil {
-            NCManageDatabase.sharedInstance.setAccountDateUpdateMedia(Date() as NSDate)
-            return
-        }
-        let lteDate: Int = Int(Date().timeIntervalSince1970)
-        let gteDate: Int = Int(fromDate!.timeIntervalSince1970)
+        if fromDate == nil { NCManageDatabase.sharedInstance.setAccountDateUpdateMedia() }
         
-        let elementDate = "nc:upload_time/"
+        //let elementDate = "nc:upload_time/"
+        //let lteDate: Int = Int(Date().timeIntervalSince1970)
+        //let gteDate: Int = Int(fromDate!.timeIntervalSince1970)
         
+        guard let lteDate = Calendar.current.date(byAdding: .day, value: 1, to: Date()) else { return }
+        let gteDate = fromDate!
+        
+        let elementDate = "d:getlastmodified/"
+
         NCCommunication.shared.searchMedia(lteDate: lteDate, gteDate: gteDate, elementDate: elementDate ,showHiddenFiles: CCUtility.getShowHiddenFiles(), user: appDelegate.activeUser) { (account, files, errorCode, errorDescription) in
             if errorCode == 0 && files != nil && files!.count > 0 {
                 NCManageDatabase.sharedInstance.addMetadatas(files: files, account: self.appDelegate.activeAccount)
-                //NCManageDatabase.sharedInstance.setAccountDateUpdateMedia(lteDate as NSDate)
-                self.reloadDataSource(loadNetworkDatasource: false) {}
+                NCManageDatabase.sharedInstance.setAccountDateUpdateMedia()
             }
+            self.reloadDataSource(loadNetworkDatasource: false) {}
         }
     }