Skip to content

Allow setting custom destinations in chunked upload #116

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 2 commits into from
Jan 10, 2025
Merged

Allow setting custom destinations in chunked upload #116

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6234617
Allow setting a different destination file name from local file name …
claucambra Jan 8, 2025
8ee2799
Make file chunks output directory customisable
claucambra Jan 8, 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
9 changes: 6 additions & 3 deletions Sources/NextcloudKit/NextcloudKit+Upload.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ public extension NextcloudKit {
/// - chunkSizeInMB: Size in MB of chunk

func uploadChunk(directory: String,
fileChunksOutputDirectory: String? = nil,
fileName: String,
destinationFileName: String? = nil,
date: Date?,
creationDate: Date?,
serverUrl: String,
Expand All @@ -119,7 +121,7 @@ public extension NextcloudKit {
}
let fileNameLocalSize = self.nkCommonInstance.getFileSize(filePath: directory + "/" + fileName)
let serverUrlChunkFolder = nkSession.urlBase + "/" + nkSession.dav + "/uploads/" + nkSession.userId + "/" + chunkFolder
let serverUrlFileName = nkSession.urlBase + "/" + nkSession.dav + "/files/" + nkSession.userId + self.nkCommonInstance.returnPathfromServerUrl(serverUrl, urlBase: nkSession.urlBase, userId: nkSession.userId) + "/" + fileName
let serverUrlFileName = nkSession.urlBase + "/" + nkSession.dav + "/files/" + nkSession.userId + self.nkCommonInstance.returnPathfromServerUrl(serverUrl, urlBase: nkSession.urlBase, userId: nkSession.userId) + "/" + (destinationFileName ?? fileName)
if options.customHeader == nil {
options.customHeader = [:]
}
Expand Down Expand Up @@ -175,7 +177,8 @@ public extension NextcloudKit {
var uploadNKError = NKError()
var uploadAFError: AFError?

self.nkCommonInstance.chunkedFile(inputDirectory: directory, outputDirectory: directory, fileName: fileName, chunkSize: chunkSize, filesChunk: filesChunk) { num in
let outputDirectory = fileChunksOutputDirectory ?? directory
self.nkCommonInstance.chunkedFile(inputDirectory: directory, outputDirectory: outputDirectory, fileName: fileName, chunkSize: chunkSize, filesChunk: filesChunk) { num in
numChunks(num)
} counterChunk: { counter in
counterChunk(counter)
Expand All @@ -190,7 +193,7 @@ public extension NextcloudKit {

for fileChunk in filesChunk {
let serverUrlFileName = serverUrlChunkFolder + "/" + fileChunk.fileName
let fileNameLocalPath = directory + "/" + fileChunk.fileName
let fileNameLocalPath = outputDirectory + "/" + fileChunk.fileName
let fileSize = self.nkCommonInstance.getFileSize(filePath: fileNameLocalPath)
if fileSize == 0 {
// The file could not be sent
Expand Down
Loading