Skip to content

upload improvements #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marinofaggiana merged 4 commits into from
Jul 21, 2025
Merged

upload improvements #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e357c10
cod
marinofaggiana Jul 19, 2025
ee2d2c6
cod
marinofaggiana Jul 21, 2025
29c2b3e
root file name
marinofaggiana Jul 21, 2025
f5b94fb
+ UUID().uuidString
marinofaggiana Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Sources/NextcloudKit/Models/NKDataFileXML.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@
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] {

Check warning on line 256 in Sources/NextcloudKit/Models/NKDataFileXML.swift

View workflow job for this annotation

GitHub Actions / Lint 

Function Body Length Violation: Function body should span 200 lines or less excluding comments and whitespace: currently spans 247 lines (function_body_length)
var files: [NKFile] = []
let rootFiles = "/" + nkSession.dav + "/files/"
guard let baseUrl = self.nkCommonInstance.getHostName(urlString: nkSession.urlBase) else {
Expand Down Expand Up @@ -299,8 +299,8 @@

// 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()
}
Expand All @@ -309,7 +309,7 @@
let propstat = element["d:propstat"][0]

if let getlastmodified = propstat["d:prop", "d:getlastmodified"].text,
let date = getlastmodified.parsedDate(using: "EEE, dd MMM y HH:mm:ss zzz") {

Check warning on line 312 in Sources/NextcloudKit/Models/NKDataFileXML.swift

View workflow job for this annotation

GitHub Actions / Lint 

Trailing Whitespace Violation: Lines should not have trailing whitespace (trailing_whitespace)
file.date = date
}

Expand Down
3 changes: 3 additions & 0 deletions Sources/NextcloudKit/NKCommon.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions Sources/NextcloudKit/NextcloudKit+WebDAV.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
Loading