marinofaggiana 4 éve
szülő
commit
9a771ab94f

+ 2 - 0
iOSClient/Data/NCManageDatabase.swift

@@ -1882,6 +1882,7 @@ class NCManageDatabase: NSObject {
         }
     }
     
+    /*
     @objc func addMetadataForAutoUpload(_ metadata: tableMetadata) {
 
         let realm = try! Realm()
@@ -1899,6 +1900,7 @@ class NCManageDatabase: NSObject {
             NCCommunicationCommon.shared.writeLog("Could not write to database: \(error)")
         }
     }
+    */
     
     @objc func renameMetadata(fileNameTo: String, ocId: String) {
         

+ 3 - 2
iOSClient/Networking/NCAutoUpload.swift

@@ -248,7 +248,7 @@ class NCAutoUpload: NSObject, CLLocationManagerDelegate {
                         
                         if selector == NCGlobal.shared.selectorUploadAutoUpload {
                             NCCommunicationCommon.shared.writeLog("Automatic upload added \(metadataForUpload.fileNameView) (\(metadataForUpload.size) bytes) with Identifier \(metadataForUpload.assetLocalIdentifier)")
-                            NCManageDatabase.shared.addMetadataForAutoUpload(metadataForUpload)
+                            self.appDelegate.networkingProcessUpload?.createProcessUploads(metadatas: [metadataForUpload], verifyAlreadyExists: true)
                             NCManageDatabase.shared.addPhotoLibrary([asset], account: account.account)
                         } else if selector == NCGlobal.shared.selectorUploadAutoUploadAll {
                             metadataFull.append(metadataForUpload)
@@ -274,7 +274,8 @@ class NCAutoUpload: NSObject, CLLocationManagerDelegate {
                                     
                                     if selector == NCGlobal.shared.selectorUploadAutoUpload {
                                         NCCommunicationCommon.shared.writeLog("Automatic upload added Live Photo \(metadataForUpload.fileNameView) (\(metadataForUpload.size) bytes) with Identifier \(metadataForUpload.assetLocalIdentifier)")
-                                        NCManageDatabase.shared.addMetadataForAutoUpload(metadataForUpload)
+                                        self.appDelegate.networkingProcessUpload?.createProcessUploads(metadatas: [metadataForUpload], verifyAlreadyExists: true)
+                                        
                                     } else if selector == NCGlobal.shared.selectorUploadAutoUploadAll {
                                         metadataFull.append(metadataForUpload)
                                     }

+ 8 - 1
iOSClient/Networking/NCNetworkingProcessUpload.swift

@@ -170,11 +170,18 @@ class NCNetworkingProcessUpload: NSObject {
     
     //MARK: -
     
-    @objc func createProcessUploads(metadatas: [tableMetadata], autoUpload: Bool = false) {
+    @objc func createProcessUploads(metadatas: [tableMetadata], verifyAlreadyExists: Bool = false) {
         
         var metadatasForUpload: [tableMetadata] = []
         
         for metadata in metadatas {
+            
+            if verifyAlreadyExists {
+                if NCManageDatabase.shared.getMetadata(predicate: NSPredicate(format: "account == %@ && serverUrl == %@ && fileName == %@ && session != ''", metadata.account, metadata.serverUrl, metadata.fileName)) != nil {
+                    continue
+                }
+            }
+            
             metadatasForUpload.append(metadata)
             
             //NCManageDatabase.shared.addMetadataForAutoUpload(metadata)