Skip to content

Header background transfers #224

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 6 commits into from
Jun 3, 2026
Merged

Header background transfers #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f3e135
background
marinofaggiana Jun 2, 2026
ffe30d1
Merge branch 'main' into header2
marinofaggiana Jun 2, 2026
14d0c81
background
marinofaggiana Jun 2, 2026
3438f6f
parsedDate
marinofaggiana Jun 2, 2026
378bf50
old source
marinofaggiana Jun 2, 2026
a98d199
fix appendToLog
marinofaggiana Jun 2, 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
5 changes: 3 additions & 2 deletions Sources/NextcloudKit/Extensions/String+Extension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ extension String {
return String(NSString(string: self).pathExtension)
}

public func parsedDate(using format: String) -> Date? {
NKLogFileManager.shared.convertDate(self, format: format)
public func parsedDate(using format: String?) -> Date? {
guard let format else { return nil }
return NKLogFileManager.shared.convertDate(self, format: format)
}
}
19 changes: 12 additions & 7 deletions Sources/NextcloudKit/Log/NKLogFileManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,14 +363,19 @@ public final class NKLogFileManager: @unchecked Sendable {

guard let data = message.data(using: .utf8) else { return }

if fileManager.fileExists(atPath: logPath.path) {
if let handle = FileHandle(forWritingAtPath: logPath.path) {
handle.seekToEndOfFile()
handle.write(data)
handle.closeFile()
do {
if !fileManager.fileExists(atPath: logPath.path) {
fileManager.createFile(atPath: logPath.path, contents: nil)
}
} else {
try? data.write(to: logPath)

let handle = try FileHandle(forWritingTo: logPath)

defer { try? handle.close() }

try handle.seekToEnd()
try handle.write(contentsOf: data)
} catch {
// Ignore log write failures to avoid crashes when the device has no free space.
}
}

Expand Down
8 changes: 4 additions & 4 deletions Sources/NextcloudKit/NKCommon.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ 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, ownerId: String?, permissions: String?, task: URLSessionTask, error: NKError)
func downloadComplete(fileName: String, serverUrl: String, allHeaderFields: [AnyHashable : Any]?, task: URLSessionTask, error: NKError)
func uploadComplete(fileName: String, serverUrl: String, allHeaderFields: [AnyHashable : Any]?, task: URLSessionTask, error: NKError)
}

public extension NextcloudKitDelegate {
Expand All @@ -43,8 +43,8 @@ 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, ownerId: String?, permissions: String?, task: URLSessionTask, error: NKError) { }
func downloadComplete(fileName: String, serverUrl: String, allHeaderFields: [AnyHashable : Any]?, task: URLSessionTask, error: NKError) { }
func uploadComplete(fileName: String, serverUrl: String, allHeaderFields: [AnyHashable : Any]?, task: URLSessionTask, error: NKError) { }
}

public struct NKCommon: Sendable {
Expand Down
30 changes: 3 additions & 27 deletions Sources/NextcloudKit/NextcloudKitBackground.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,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?
var fileName: String = "", serverUrl: String = ""
let url = task.currentRequest?.url?.absoluteString.removingPercentEncoding
if let url {
fileName = (url as NSString).lastPathComponent
Expand All @@ -302,33 +301,10 @@ 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 {
ocId = self.nkCommonInstance.findHeader("fileid", allHeaderFields: header)
}
if self.nkCommonInstance.findHeader("oc-etag", allHeaderFields: header) != nil {
etag = self.nkCommonInstance.findHeader("oc-etag", allHeaderFields: header)
} else if self.nkCommonInstance.findHeader("etag", allHeaderFields: header) != nil {
etag = self.nkCommonInstance.findHeader("etag", allHeaderFields: header)
}
if etag != nil { etag = etag?.replacingOccurrences(of: "\"", with: "") }
if let dateRaw = self.nkCommonInstance.findHeader("date", allHeaderFields: header) {
date = dateRaw.parsedDate(using: "EEE, dd MMM y HH:mm:ss zzz")
}
if let dateString = header["Last-Modified"] as? String {
dateLastModified = dateString.parsedDate(using: "EEE, dd MMM y HH:mm:ss zzz")
}
length = header["Content-Length"] as? Int64 ?? 0
}

if task is URLSessionDownloadTask {
self.nkCommonInstance.delegate?.downloadComplete(fileName: fileName, serverUrl: serverUrl, etag: etag, date: date, dateLastModified: dateLastModified, length: length, task: task, error: nkError)
self.nkCommonInstance.delegate?.downloadComplete(fileName: fileName, serverUrl: serverUrl, allHeaderFields: (task.response as? HTTPURLResponse)?.allHeaderFields, 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, ownerId: ownerId, permissions: permissions, task: task, error: nkError)
self.nkCommonInstance.delegate?.uploadComplete(fileName: fileName, serverUrl: serverUrl, allHeaderFields: (task.response as? HTTPURLResponse)?.allHeaderFields, task: task, error: nkError)
}
}

Expand Down
Loading