Skip to content

Modify upload PUT request #221

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

Open
mpivchev wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Modify upload PUT request #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30b3ef3
Modify upload PUT request
mpivchev May 18, 2026
9c12bd3
Error fix
mpivchev May 18, 2026
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
4 changes: 2 additions & 2 deletions Sources/NextcloudKit/NKCommon.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public protocol NextcloudKitDelegate: AnyObject, Sendable {
func downloadingFinish(_ session: URLSession, downloadTask: URLSessionDownloadTask, didFinishDownloadingTo location: URL)

func downloadComplete(fileName: String, serverUrl: String, etag: String?, date: Date?, dateLastModified: Date?, length: Int64, task: URLSessionTask, error: NKError)
func uploadComplete(fileName: String, serverUrl: String, ocId: String?, etag: String?, date: Date?, size: Int64, task: URLSessionTask, error: NKError)
func uploadComplete(fileName: String, serverUrl: String, ocId: String?, etag: String?, date: Date?, size: Int64, ownerId: String?, permissions: String?, task: URLSessionTask, error: NKError)
}

public extension NextcloudKitDelegate {
Expand All @@ -44,7 +44,7 @@ public extension NextcloudKitDelegate {
func downloadingFinish(_ session: URLSession, downloadTask: URLSessionDownloadTask, didFinishDownloadingTo location: URL) { }

func downloadComplete(fileName: String, serverUrl: String, etag: String?, date: Date?, dateLastModified: Date?, length: Int64, task: URLSessionTask, error: NKError) { }
func uploadComplete(fileName: String, serverUrl: String, ocId: String?, etag: String?, date: Date?, size: Int64, task: URLSessionTask, error: NKError) { }
func uploadComplete(fileName: String, serverUrl: String, ocId: String?, etag: String?, date: Date?, size: Int64, ownerId: String?, permissions: String?, task: URLSessionTask, error: NKError) { }
}

public struct NKCommon: Sendable {
Expand Down
45 changes: 28 additions & 17 deletions Sources/NextcloudKit/NextcloudKit+Upload.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ public extension NextcloudKit {
/// - etag: The entity tag for versioning.
/// - date: The server date of the operation.
/// - size: The total uploaded size in bytes.
/// - headers: The response headers.
/// - ownerId: The owner id returned by the server.
/// - permissions: The DAV permissions returned by the server.
/// - response: The raw upload response.
/// - nkError: The result status.
func upload(serverUrlFileName: Any,
fileNameLocalPath: String,
Expand All @@ -40,7 +42,7 @@ public extension NextcloudKit {
requestHandler: @escaping (_ request: UploadRequest) -> Void = { _ in },
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
progressHandler: @escaping (_ progress: Progress) -> Void = { _ in },
completionHandler: @escaping (_ account: String, _ ocId: String?, _ etag: String?, _ date: Date?, _ size: Int64, _ response: AFDataResponse<Data>?, _ nkError: NKError) -> Void) {
completionHandler: @escaping (_ account: String, _ ocId: String?, _ etag: String?, _ date: Date?, _ size: Int64, _ ownerId: String?, _ permissions: String?, _ response: AFDataResponse<Data>?, _ nkError: NKError) -> Void) {
var convertible: URLConvertible?
var uploadedSize: Int64 = 0

Expand All @@ -52,7 +54,7 @@ public extension NextcloudKit {
guard let url = convertible,
let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
var headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
return options.queue.async { completionHandler(account, nil, nil, nil, 0, nil, .urlError) }
return options.queue.async { completionHandler(account, nil, nil, nil, 0, nil, nil, nil, .urlError) }
}
let fileNameLocalPathUrl = URL(fileURLWithPath: fileNameLocalPath)
// Epoch of linux do not permitted negativ value
Expand Down Expand Up @@ -80,27 +82,30 @@ public extension NextcloudKit {
uploadedSize = progress.totalUnitCount
options.queue.async { progressHandler(progress) }
} .responseData(queue: self.nkCommonInstance.backgroundQueue) { response in
var ocId: String?, etag: String?, date: Date?

if self.nkCommonInstance.findHeader("oc-fileid", allHeaderFields: response.response?.allHeaderFields) != nil {
ocId = self.nkCommonInstance.findHeader("oc-fileid", allHeaderFields: response.response?.allHeaderFields)
} else if self.nkCommonInstance.findHeader("fileid", allHeaderFields: response.response?.allHeaderFields) != nil {
ocId = self.nkCommonInstance.findHeader("fileid", allHeaderFields: response.response?.allHeaderFields)
var ocId: String?, etag: String?, date: Date?, ownerId: String?, permissions: String?
let allHeaderFields = response.response?.allHeaderFields

ownerId = self.nkCommonInstance.findHeader("x-nc-ownerid", allHeaderFields: allHeaderFields)
permissions = self.nkCommonInstance.findHeader("x-nc-permissions", allHeaderFields: allHeaderFields)
if self.nkCommonInstance.findHeader("oc-fileid", allHeaderFields: allHeaderFields) != nil {
ocId = self.nkCommonInstance.findHeader("oc-fileid", allHeaderFields: allHeaderFields)
} else if self.nkCommonInstance.findHeader("fileid", allHeaderFields: allHeaderFields) != nil {
ocId = self.nkCommonInstance.findHeader("fileid", allHeaderFields: allHeaderFields)
}
if self.nkCommonInstance.findHeader("oc-etag", allHeaderFields: response.response?.allHeaderFields) != nil {
etag = self.nkCommonInstance.findHeader("oc-etag", allHeaderFields: response.response?.allHeaderFields)
} else if self.nkCommonInstance.findHeader("etag", allHeaderFields: response.response?.allHeaderFields) != nil {
etag = self.nkCommonInstance.findHeader("etag", allHeaderFields: response.response?.allHeaderFields)
if self.nkCommonInstance.findHeader("oc-etag", allHeaderFields: allHeaderFields) != nil {
etag = self.nkCommonInstance.findHeader("oc-etag", allHeaderFields: allHeaderFields)
} else if self.nkCommonInstance.findHeader("etag", allHeaderFields: allHeaderFields) != nil {
etag = self.nkCommonInstance.findHeader("etag", allHeaderFields: allHeaderFields)
}
if etag != nil {
etag = etag?.replacingOccurrences(of: "\"", with: "")
}
if let dateRaw = self.nkCommonInstance.findHeader("date", allHeaderFields: response.response?.allHeaderFields) {
if let dateRaw = self.nkCommonInstance.findHeader("date", allHeaderFields: allHeaderFields) {
date = dateRaw.parsedDate(using: "EEE, dd MMM y HH:mm:ss zzz")
}

options.queue.async {
completionHandler(account, ocId, etag, date, uploadedSize, response, self.evaluateResponse(response))
completionHandler(account, ocId, etag, date, uploadedSize, ownerId, permissions, response, self.evaluateResponse(response))
}
}

Expand All @@ -119,7 +124,9 @@ public extension NextcloudKit {
/// - etag: The file etag returned by the server.
/// - date: The server timestamp.
/// - size: The size of the uploaded file in bytes.
/// - headers: The raw HTTP response headers.
/// - ownerId: The owner id returned by the server.
/// - permissions: The DAV permissions returned by the server.
/// - response: The raw upload response.
/// - error: The NKError result of the upload.
func uploadAsync(serverUrlFileName: Any,
fileNameLocalPath: String,
Expand All @@ -138,6 +145,8 @@ public extension NextcloudKit {
etag: String?,
date: Date?,
size: Int64,
ownerId: String?,
permissions: String?,
response: AFDataResponse<Data>?,
error: NKError
) {
Expand All @@ -152,13 +161,15 @@ public extension NextcloudKit {
options: options,
requestHandler: requestHandler,
taskHandler: taskHandler,
progressHandler: progressHandler) { account, ocId, etag, date, size, response, error in
progressHandler: progressHandler) { account, ocId, etag, date, size, ownerId, permissions, response, error in
continuation.resume(returning: (
account: account,
ocId: ocId,
etag: etag,
date: date,
size: size,
ownerId: ownerId,
permissions: permissions,
response: response,
error: error
))
Expand Down
5 changes: 4 additions & 1 deletion Sources/NextcloudKit/NextcloudKitBackground.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ public final class NKBackground: NSObject, URLSessionTaskDelegate, URLSessionDel

public func urlSession(_ session: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
var fileName: String = "", serverUrl: String = "", etag: String?, ocId: String?, date: Date?, dateLastModified: Date?, length: Int64 = 0
var ownerId: String?, permissions: String?
let url = task.currentRequest?.url?.absoluteString.removingPercentEncoding
if let url {
fileName = (url as NSString).lastPathComponent
Expand All @@ -302,6 +303,8 @@ public final class NKBackground: NSObject, URLSessionTaskDelegate, URLSessionDel
}

if let header = (task.response as? HTTPURLResponse)?.allHeaderFields {
ownerId = self.nkCommonInstance.findHeader("x-nc-ownerid", allHeaderFields: header)
permissions = self.nkCommonInstance.findHeader("x-nc-permissions", allHeaderFields: header)
if self.nkCommonInstance.findHeader("oc-fileid", allHeaderFields: header) != nil {
ocId = self.nkCommonInstance.findHeader("oc-fileid", allHeaderFields: header)
} else if self.nkCommonInstance.findHeader("fileid", allHeaderFields: header) != nil {
Expand All @@ -325,7 +328,7 @@ public final class NKBackground: NSObject, URLSessionTaskDelegate, URLSessionDel
if task is URLSessionDownloadTask {
self.nkCommonInstance.delegate?.downloadComplete(fileName: fileName, serverUrl: serverUrl, etag: etag, date: date, dateLastModified: dateLastModified, length: length, task: task, error: nkError)
} else if task is URLSessionUploadTask {
self.nkCommonInstance.delegate?.uploadComplete(fileName: fileName, serverUrl: serverUrl, ocId: ocId, etag: etag, date: date, size: task.countOfBytesExpectedToSend, task: task, error: nkError)
self.nkCommonInstance.delegate?.uploadComplete(fileName: fileName, serverUrl: serverUrl, ocId: ocId, etag: etag, date: date, size: task.countOfBytesExpectedToSend, ownerId: ownerId, permissions: permissions, task: task, error: nkError)
}
}

Expand Down
Loading