|
|
@@ -625,57 +625,53 @@ extension NCMedia {
|
|
|
NCUtility.sharedInstance.stopActivityIndicator()
|
|
|
|
|
|
if errorCode == 0 && account == self.appDelegate.activeAccount {
|
|
|
+
|
|
|
+ let metadatas = NCNetworking.sharedInstance.convertFilesToMetadatas(files!, metadataFolder: nil)
|
|
|
+
|
|
|
+ var isDifferent: Bool = false
|
|
|
+ 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, lteDate: lteDate, gteDate: gteDate, account: account)
|
|
|
+ isDifferent = difference.isDifferent
|
|
|
+ newInsert = difference.newInsert
|
|
|
|
|
|
- DispatchQueue.global().async {
|
|
|
-
|
|
|
- let metadatas = NCNetworking.sharedInstance.convertFilesToMetadatas(files!, metadataFolder: nil)
|
|
|
-
|
|
|
- var isDifferent: Bool = false
|
|
|
- var newInsert: Int = 0
|
|
|
+ self.loadingSearch = false
|
|
|
|
|
|
- let totalDistance = Calendar.current.dateComponents([Calendar.Component.day], from: gteDate, to: lteDate).value(for: .day) ?? 0
|
|
|
+ print("[LOG] Search: Totale Distance \(totalDistance) - It's Different \(isDifferent) - New insert \(newInsert)")
|
|
|
|
|
|
- let difference = NCManageDatabase.sharedInstance.createTableMedia(metadatas, lteDate: lteDate, gteDate: gteDate, account: account)
|
|
|
- isDifferent = difference.isDifferent
|
|
|
- newInsert = difference.newInsert
|
|
|
-
|
|
|
- self.loadingSearch = false
|
|
|
-
|
|
|
- print("[LOG] Search: Totale Distance \(totalDistance) - It's Different \(isDifferent) - New insert \(newInsert)")
|
|
|
+ if isDifferent {
|
|
|
+ self.reloadDataSource(loadNetworkDatasource: false) { }
|
|
|
+ }
|
|
|
|
|
|
- if isDifferent {
|
|
|
- self.reloadDataSource(loadNetworkDatasource: false) { }
|
|
|
- }
|
|
|
+ if (isDifferent == false || newInsert+insertPrevius < 100) && addPast && setDistantPast == false {
|
|
|
|
|
|
- if (isDifferent == false || newInsert+insertPrevius < 100) && addPast && setDistantPast == false {
|
|
|
-
|
|
|
- switch totalDistance {
|
|
|
- case 0...89:
|
|
|
- if var gteDate90 = Calendar.current.date(byAdding: .day, value: -90, to: gteDate) {
|
|
|
- gteDate90 = Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: gteDate90) ?? Date()
|
|
|
- self.search(lteDate: lteDate, gteDate: gteDate90, addPast: addPast, insertPrevius: newInsert+insertPrevius, setDistantPast: false, debug: "search recursive -90 gg")
|
|
|
- }
|
|
|
- case 90...179:
|
|
|
- if var gteDate180 = Calendar.current.date(byAdding: .day, value: -180, to: gteDate) {
|
|
|
- gteDate180 = Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: gteDate180) ?? Date()
|
|
|
- self.search(lteDate: lteDate, gteDate: gteDate180, addPast: addPast, insertPrevius: newInsert+insertPrevius, setDistantPast: false, debug: "search recursive -180 gg")
|
|
|
- }
|
|
|
- case 180...364:
|
|
|
- if var gteDate365 = Calendar.current.date(byAdding: .day, value: -365, to: gteDate) {
|
|
|
- gteDate365 = Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: gteDate365) ?? Date()
|
|
|
- self.search(lteDate: lteDate, gteDate: gteDate365, addPast: addPast, insertPrevius: newInsert+insertPrevius, setDistantPast: false, debug: "search recursive -365 gg")
|
|
|
- }
|
|
|
- default:
|
|
|
- self.search(lteDate: lteDate, gteDate: NSDate.distantPast, addPast: addPast, insertPrevius: newInsert+insertPrevius, setDistantPast: true, debug: "search recursive distant pass")
|
|
|
+ switch totalDistance {
|
|
|
+ case 0...89:
|
|
|
+ if var gteDate90 = Calendar.current.date(byAdding: .day, value: -90, to: gteDate) {
|
|
|
+ gteDate90 = Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: gteDate90) ?? Date()
|
|
|
+ self.search(lteDate: lteDate, gteDate: gteDate90, addPast: addPast, insertPrevius: newInsert+insertPrevius, setDistantPast: false, debug: "search recursive -90 gg")
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
- DispatchQueue.main.async {
|
|
|
- self.reloadDataThenPerform {
|
|
|
- self.downloadThumbnail()
|
|
|
+ case 90...179:
|
|
|
+ if var gteDate180 = Calendar.current.date(byAdding: .day, value: -180, to: gteDate) {
|
|
|
+ gteDate180 = Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: gteDate180) ?? Date()
|
|
|
+ self.search(lteDate: lteDate, gteDate: gteDate180, addPast: addPast, insertPrevius: newInsert+insertPrevius, setDistantPast: false, debug: "search recursive -180 gg")
|
|
|
+ }
|
|
|
+ case 180...364:
|
|
|
+ if var gteDate365 = Calendar.current.date(byAdding: .day, value: -365, to: gteDate) {
|
|
|
+ gteDate365 = Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: gteDate365) ?? Date()
|
|
|
+ self.search(lteDate: lteDate, gteDate: gteDate365, addPast: addPast, insertPrevius: newInsert+insertPrevius, setDistantPast: false, debug: "search recursive -365 gg")
|
|
|
}
|
|
|
+ default:
|
|
|
+ self.search(lteDate: lteDate, gteDate: NSDate.distantPast, addPast: addPast, insertPrevius: newInsert+insertPrevius, setDistantPast: true, debug: "search recursive distant pass")
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ self.reloadDataThenPerform {
|
|
|
+ self.downloadThumbnail()
|
|
|
+ }
|
|
|
+
|
|
|
} else {
|
|
|
|
|
|
self.loadingSearch = false
|
marinofaggiana