Merge pull request #169 from nextcloud/upload

upload improvements

Author: marinofaggiana

Sources/NextcloudKit/Models/NKDataFileXML.swift

@@ -253,7 +253,7 @@ public class NKDataFileXML: NSObject {
         return xml["ocs", "data", "apppassword"].text
     }
 
-    func convertDataFile(xmlData: Data, nkSession: NKSession, showHiddenFiles: Bool, includeHiddenFiles: [String]) async -> [NKFile] {
+    func convertDataFile(xmlData: Data, nkSession: NKSession, rootFileName: String, showHiddenFiles: Bool, includeHiddenFiles: [String]) async -> [NKFile] {
         var files: [NKFile] = []
         let rootFiles = "/" + nkSession.dav + "/files/"
         guard let baseUrl = self.nkCommonInstance.getHostName(urlString: nkSession.urlBase) else {
@@ -299,8 +299,8 @@ public class NKDataFileXML: NSObject {
 
                 // ServerUrl
                 if href == rootFiles + nkSession.user + "/" {
-                    file.fileName = "."
-                    file.serverUrl = ".."
+                    file.fileName = rootFileName
+                    file.serverUrl = baseUrl + rootFiles + nkSession.user
                 } else {
                     file.serverUrl = baseUrl + file.path.dropLast()
                 }

Sources/NextcloudKit/NKCommon.swift

@@ -53,6 +53,9 @@ public struct NKCommon: Sendable {
     public var groupIdentifier: String?
     public let typeIdentifiers: NKTypeIdentifiers = .shared
 
+    // Roor fileName folder
+    public let rootFileName: String = ".__NC_ROOT__"
+
     // Foreground
     public let identifierSessionDownload: String = "com.nextcloud.nextcloudkit.session.download"
     public let identifierSessionUpload: String = "com.nextcloud.nextcloudkit.session.upload"

Sources/NextcloudKit/NextcloudKit+WebDAV.swift

@@ -416,7 +416,7 @@ public extension NextcloudKit {
             case .success:
                 if let xmlData = response.data {
                     Task {
-                        let files = await NKDataFileXML(nkCommonInstance: self.nkCommonInstance).convertDataFile(xmlData: xmlData, nkSession: nkSession, showHiddenFiles: showHiddenFiles, includeHiddenFiles: includeHiddenFiles)
+                        let files = await NKDataFileXML(nkCommonInstance: self.nkCommonInstance).convertDataFile(xmlData: xmlData, nkSession: nkSession, rootFileName: self.nkCommonInstance.rootFileName, showHiddenFiles: showHiddenFiles, includeHiddenFiles: includeHiddenFiles)
                         options.queue.async { completion(account, files, response, .success) }
                     }
                 } else {
@@ -888,7 +888,7 @@ public extension NextcloudKit {
             case .success:
                 if let xmlData = response.data {
                     Task {
-                        let files = await NKDataFileXML(nkCommonInstance: self.nkCommonInstance).convertDataFile(xmlData: xmlData, nkSession: nkSession, showHiddenFiles: showHiddenFiles, includeHiddenFiles: includeHiddenFiles)
+                        let files = await NKDataFileXML(nkCommonInstance: self.nkCommonInstance).convertDataFile(xmlData: xmlData, nkSession: nkSession, rootFileName: self.nkCommonInstance.rootFileName, showHiddenFiles: showHiddenFiles, includeHiddenFiles: includeHiddenFiles)
                         options.queue.async { completion(account, files, response, .success) }
                     }
                 } else {
@@ -1083,7 +1083,7 @@ public extension NextcloudKit {
             case .success:
                 if let xmlData = response.data {
                     Task {
-                        let files = await NKDataFileXML(nkCommonInstance: self.nkCommonInstance).convertDataFile(xmlData: xmlData, nkSession: nkSession, showHiddenFiles: showHiddenFiles, includeHiddenFiles: includeHiddenFiles)
+                        let files = await NKDataFileXML(nkCommonInstance: self.nkCommonInstance).convertDataFile(xmlData: xmlData, nkSession: nkSession, rootFileName: self.nkCommonInstance.rootFileName, showHiddenFiles: showHiddenFiles, includeHiddenFiles: includeHiddenFiles)
                         options.queue.async { completion(account, files, response, .success) }
                     }
                 } else {