Browse Source

clear code

marinofaggiana 6 years ago
parent
commit
931998e0f3
2 changed files with 9 additions and 9 deletions
  1. 5 5
      iOSClient/Database/NCManageDatabase.swift
  2. 4 4
      iOSClient/Media/NCMedia.swift

+ 5 - 5
iOSClient/Database/NCManageDatabase.swift

@@ -1978,14 +1978,14 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func createTableMedia(_ metadatas: [tableMetadata], lteDate: Date, gteDate: Date,account: String) -> (isDifferent: Bool, differenceNumInsert: Int) {
+    func createTableMedia(_ metadatas: [tableMetadata], lteDate: Date, gteDate: Date,account: String) -> (isDifferent: Bool, newInsert: Int) {
 
         let realm = try! Realm()
         realm.refresh()
         
         var numDelete: Int = 0
         var numInsert: Int = 0
-        var differenceNumInsert: Int = 0
+        var newInsert: Int = 0
         var etagsDelete = [String]()
         var etagsInsert = [String]()
         var isDifferent: Bool = false
@@ -2005,20 +2005,20 @@ class NCManageDatabase: NSObject {
                 numInsert = photos.count
                 realm.add(photos, update: true)
                 
-                // CALCULATE RETURN
+                // CALCULATE DIFFERENT RETURN
                 if etagsDelete.count == etagsInsert.count && etagsDelete.sorted() == etagsInsert.sorted() {
                     isDifferent = false
                 } else {
                     isDifferent = true
                 }
-                differenceNumInsert = numInsert - numDelete
+                newInsert = numInsert - numDelete
             }
         } catch let error {
             print("[LOG] Could not write to database: ", error)
             realm.cancelWrite()
         }
         
-        return(isDifferent, differenceNumInsert)
+        return(isDifferent, newInsert)
     }
     
     @objc func getTableMediaDate(account: String, order: ComparisonResult) -> Date {

+ 4 - 4
iOSClient/Media/NCMedia.swift

@@ -550,23 +550,23 @@ extension NCMedia {
             if errorCode == 0 && account == self.appDelegate.activeAccount {
                 
                 var isDifferent: Bool = false
-                var differenceNumInsert: Int = 0
+                var newInsert: Int = 0
                 
                 let totalDistance = Calendar.current.dateComponents([Calendar.Component.day], from: gteDate, to: lteDate).value(for: .day) ?? 0
                 
                 let difference = NCManageDatabase.sharedInstance.createTableMedia(metadatas as! [tableMetadata], lteDate: lteDate, gteDate: gteDate, account: account!)
                 isDifferent = difference.isDifferent
-                differenceNumInsert = difference.differenceNumInsert
+                newInsert = difference.newInsert
                 
                 self.loadingSearch = false
                 
-                print("[LOG] Search: Totale Distance \(totalDistance) - It's Different \(isDifferent) - Different Num \(differenceNumInsert)")
+                print("[LOG] Search: Totale Distance \(totalDistance) - It's Different \(isDifferent) - New insert \(newInsert)")
                 
                 if isDifferent {
                     self.reloadDataSource(loadNetworkDatasource: false)
                 }
                 
-                if (isDifferent == false || differenceNumInsert < 100) && addPast && setDistantPast == false {
+                if (isDifferent == false || newInsert < 100) && addPast && setDistantPast == false {
                     
                     switch totalDistance {
                     case 0...89: