upload - serverurl

File Provider Extension/FileProviderExtension+Actions.swift

@@ -396,6 +396,7 @@ extension FileProviderExtension {
                 metadata.fileID = tableDirectory.directoryID + fileName
                 metadata.fileName = fileName
                 metadata.fileNameView = fileName
+                metadata.serverUrl = tableDirectory.serverUrl
                 metadata.size = size
                 metadata.status = Int(k_metadataStatusHide)
                

Share/ShareViewController.m

@@ -224,6 +224,7 @@
         metadataForUpload.fileID = [directoryID stringByAppendingString:fileName];
         metadataForUpload.fileName = fileName;
         metadataForUpload.fileNameView = fileName;
+        metadataForUpload.serverUrl = self.serverUrl;
         metadataForUpload.session = k_upload_session_foreground;
         metadataForUpload.sessionSelector = selectorUploadFile;
         metadataForUpload.status = k_metadataStatusWaitUpload;

iOSClient/AutoUpload/NCAutoUpload.m

@@ -419,6 +419,7 @@
             metadataForUpload.fileID = [directoryID stringByAppendingString:fileName];
             metadataForUpload.fileName = fileName;
             metadataForUpload.fileNameView = fileName;
+            metadataForUpload.serverUrl = serverUrl;
             metadataForUpload.session = session;
             metadataForUpload.sessionSelector = selector;
             metadataForUpload.size = [[NCUtility sharedInstance] getFileSizeWithAsset:asset];

iOSClient/Main/CCMain.m

@@ -724,6 +724,7 @@
                     metadataForUpload.fileID = fileID;
                     metadataForUpload.fileName = fileName;
                     metadataForUpload.fileNameView = fileName;
+                    metadataForUpload.serverUrl = serverUrl;
                     metadataForUpload.session = k_upload_session;
                     metadataForUpload.sessionSelector = selectorUploadFile;
                     metadataForUpload.size = data.length;
@@ -1075,6 +1076,7 @@
         metadataForUpload.fileID = [directoryID stringByAppendingString:fileName];
         metadataForUpload.fileName = fileName;
         metadataForUpload.fileNameView = fileName;
+        metadataForUpload.serverUrl = serverUrl;
         metadataForUpload.session = session;
         metadataForUpload.sessionSelector = selectorUploadFile;
         metadataForUpload.size = [[NCUtility sharedInstance] getFileSizeWithAsset:asset];
@@ -3085,6 +3087,7 @@
                 metadataForUpload.fileID = fileID;
                 metadataForUpload.fileName = fileName;
                 metadataForUpload.fileNameView = fileName;
+                metadataForUpload.serverUrl = self.serverUrl;
                 metadataForUpload.session = k_upload_session;
                 metadataForUpload.sessionSelector = selectorUploadFile;
                 metadataForUpload.size = metadata.size;

iOSClient/Main/Create cloud/NCCreateFormUploadFileText.swift

@@ -183,7 +183,7 @@ class NCCreateFormUploadFileText: XLFormViewController, NCSelectDelegate {
             }
             
             let overwriteAction = UIAlertAction(title: NSLocalizedString("_overwrite_", comment: ""), style: .cancel) { (action:UIAlertAction) in
-                self.dismissAndUpload(fileNameSave, fileID: metadata!.fileID, directoryID: directoryID)
+                self.dismissAndUpload(fileNameSave, fileID: metadata!.fileID, directoryID: directoryID, serverUrl: self.serverUrl)
             }
             
             alertController.addAction(cancelAction)
@@ -193,11 +193,11 @@ class NCCreateFormUploadFileText: XLFormViewController, NCSelectDelegate {
             
         } else {
             let directoryID = NCManageDatabase.sharedInstance.getDirectoryID(self.serverUrl)!
-            dismissAndUpload(fileNameSave, fileID: directoryID + fileNameSave, directoryID: directoryID)
+            dismissAndUpload(fileNameSave, fileID: directoryID + fileNameSave, directoryID: directoryID, serverUrl: serverUrl)
         }
     }
     
-    func dismissAndUpload(_ fileNameSave: String, fileID: String, directoryID: String) {
+    func dismissAndUpload(_ fileNameSave: String, fileID: String, directoryID: String, serverUrl: String) {
         
         self.dismiss(animated: true, completion: {
             
@@ -214,6 +214,7 @@ class NCCreateFormUploadFileText: XLFormViewController, NCSelectDelegate {
                 metadataForUpload.fileID = fileID
                 metadataForUpload.fileName = fileNameSave
                 metadataForUpload.fileNameView = fileNameSave
+                metadataForUpload.serverUrl = serverUrl
                 metadataForUpload.session = k_upload_session
                 metadataForUpload.sessionSelector = selectorUploadFile
                 metadataForUpload.status = Int(k_metadataStatusWaitUpload)

iOSClient/Main/Create cloud/NCCreateFormUploadScanDocument.swift

@@ -324,7 +324,7 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate {
             
             let overwriteAction = UIAlertAction(title: NSLocalizedString("_overwrite_", comment: ""), style: .cancel) { (action:UIAlertAction) in
                 NCManageDatabase.sharedInstance.deleteMetadata(predicate: NSPredicate(format: "directoryID == %@ AND fileNameView == %@", directoryID, fileNameSave))
-                self.dismissAndUpload(fileNameSave, fileID: directoryID + fileNameSave, directoryID: directoryID)
+                self.dismissAndUpload(fileNameSave, fileID: directoryID + fileNameSave, directoryID: directoryID, serverUrl: self.serverUrl)
             }
             
             alertController.addAction(cancelAction)
@@ -334,11 +334,11 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate {
             
         } else {
             let directoryID = NCManageDatabase.sharedInstance.getDirectoryID(self.serverUrl)!
-            dismissAndUpload(fileNameSave, fileID: directoryID + fileNameSave, directoryID: directoryID)
+            dismissAndUpload(fileNameSave, fileID: directoryID + fileNameSave, directoryID: directoryID, serverUrl: serverUrl)
         }
     }
     
-    func dismissAndUpload(_ fileNameSave: String, fileID: String, directoryID: String) {
+    func dismissAndUpload(_ fileNameSave: String, fileID: String, directoryID: String, serverUrl: String) {
         
         guard let fileNameGenerateExport = CCUtility.getDirectoryProviderStorageFileID(fileID, fileNameView: fileNameSave) else {
             self.appDelegate.messageNotification("_error_", description: "_error_creation_file_", visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.info, errorCode: 0)
@@ -396,6 +396,7 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate {
         metadataForUpload.fileID = fileID
         metadataForUpload.fileName = fileNameSave
         metadataForUpload.fileNameView = fileNameSave
+        metadataForUpload.serverUrl = serverUrl
         metadataForUpload.session = k_upload_session
         metadataForUpload.sessionSelector = selectorUploadFile
         metadataForUpload.status = Int(k_metadataStatusWaitUpload)

iOSClient/UploadFromOtherUpp/CCUploadFromOtherUpp.m

@@ -185,6 +185,7 @@
     metadataForUpload.fileID = fileID;
     metadataForUpload.fileName = fileName;
     metadataForUpload.fileNameView = fileName;
+    metadataForUpload.serverUrl = serverUrlLocal;
     metadataForUpload.session = k_upload_session;
     metadataForUpload.sessionSelector = selectorUploadFile;
     metadataForUpload.status = k_metadataStatusWaitUpload;