|
|
@@ -702,29 +702,30 @@ extension NCMedia {
|
|
|
if errorCode == 0 && account == self.appDelegate.activeAccount {
|
|
|
if files.count > 0 {
|
|
|
|
|
|
- var addFiles = [NCCommunicationFile]()
|
|
|
- for file in files {
|
|
|
- if NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "ocId == %@ && etag == %@", file.ocId, file.etag)) == nil {
|
|
|
- addFiles.append(file)
|
|
|
- }
|
|
|
- }
|
|
|
- NCManageDatabase.sharedInstance.addMetadatas(files: addFiles, account: self.appDelegate.activeAccount)
|
|
|
+ let predicateDate = NSPredicate(format: "date > %@ AND date < %@", greaterDate as NSDate, lessDate as NSDate)
|
|
|
+ let predicate = NSCompoundPredicate.init(andPredicateWithSubpredicates:[predicateDate, self.predicateDefault!])
|
|
|
+ let metadatasResult = NCManageDatabase.sharedInstance.getMetadatas(predicate: predicate)
|
|
|
|
|
|
- if addFiles.count < 100 {
|
|
|
+ NCManageDatabase.sharedInstance.convertNCCommunicationFilesToMetadatas(files, useMetadataFolder: false, account: self.appDelegate.activeAccount) { (_, _, metadatas) in
|
|
|
|
|
|
- if value == -30 {
|
|
|
- self.searchOldPhotoVideo(value: -90)
|
|
|
- } else if value == -90 {
|
|
|
- self.searchOldPhotoVideo(value: -180)
|
|
|
- } else if value == -180 {
|
|
|
- self.searchOldPhotoVideo(value: -999)
|
|
|
+ let metadatasChanged = NCManageDatabase.sharedInstance.updateMetadatas(metadatas, metadatasResult: metadatasResult)
|
|
|
+
|
|
|
+ if metadatasChanged.count < 100 {
|
|
|
+
|
|
|
+ if value == -30 {
|
|
|
+ self.searchOldPhotoVideo(value: -90)
|
|
|
+ } else if value == -90 {
|
|
|
+ self.searchOldPhotoVideo(value: -180)
|
|
|
+ } else if value == -180 {
|
|
|
+ self.searchOldPhotoVideo(value: -999)
|
|
|
+ } else {
|
|
|
+ self.reloadDataSource()
|
|
|
+ }
|
|
|
+
|
|
|
} else {
|
|
|
+
|
|
|
self.reloadDataSource()
|
|
|
}
|
|
|
-
|
|
|
- } else {
|
|
|
-
|
|
|
- self.reloadDataSource()
|
|
|
}
|
|
|
|
|
|
} else {
|
marinofaggiana