From f779d71a31bd213e3f9240feba55b1b321f74d08 Mon Sep 17 00:00:00 2001 From: Marino Faggiana Date: Fri, 30 May 2025 15:19:28 +0200 Subject: [PATCH] added FunctionAsync in function async/await Signed-off-by: Marino Faggiana --- Sources/NextcloudKit/NextcloudKit+API.swift | 24 +++---- Sources/NextcloudKit/NextcloudKit+E2EE.swift | 40 ++++++------ .../NextcloudKit/NextcloudKit+Livephoto.swift | 8 +-- .../NextcloudKit/NextcloudKit+NCText.swift | 3 +- .../NextcloudKit+RecommendedFiles.swift | 4 +- .../NextcloudKit+Richdocuments.swift | 4 +- .../NextcloudKit/NextcloudKit+WebDAV.swift | 63 +++++++++++-------- 7 files changed, 80 insertions(+), 66 deletions(-) diff --git a/Sources/NextcloudKit/NextcloudKit+API.swift b/Sources/NextcloudKit/NextcloudKit+API.swift index 8d381e95..b46e69e5 100644 --- a/Sources/NextcloudKit/NextcloudKit+API.swift +++ b/Sources/NextcloudKit/NextcloudKit+API.swift @@ -205,8 +205,8 @@ public extension NextcloudKit { } } - func getServerStatus(serverUrl: String, - options: NKRequestOptions = NKRequestOptions()) async -> NextcloudKit.ServerInfoResult { + func getServerStatusAsync(serverUrl: String, + options: NKRequestOptions = NKRequestOptions()) async -> NextcloudKit.ServerInfoResult { await withUnsafeContinuation({ continuation in NextcloudKit.shared.getServerStatus(serverUrl: serverUrl) { _, serverInfoResult in continuation.resume(returning: serverInfoResult) @@ -249,9 +249,9 @@ public extension NextcloudKit { } } - func downloadPreview(url: URL, - account: String, - options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse?, error: NKError) { + func downloadPreviewAsync(url: URL, + account: String, + options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse?, error: NKError) { await withUnsafeContinuation({ continuation in NextcloudKit.shared.downloadPreview(url: url, account: account, options: options) { account, responseData, error in continuation.resume(returning: (account: account, responseData: responseData, error: error)) @@ -301,10 +301,10 @@ public extension NextcloudKit { } } - func downloadPreview(fileId: String, - etag: String? = nil, - account: String, - options: NKRequestOptions = NKRequestOptions()) async -> (account: String, width: Int, height: Int, etag: String?, responseData: AFDataResponse?, error: NKError) { + func downloadPreviewAsync(fileId: String, + etag: String? = nil, + account: String, + options: NKRequestOptions = NKRequestOptions()) async -> (account: String, width: Int, height: Int, etag: String?, responseData: AFDataResponse?, error: NKError) { await withUnsafeContinuation({ continuation in NextcloudKit.shared.downloadPreview(fileId: fileId, etag: etag, account: account, options: options) { account, width, height, etag, responseData, error in continuation.resume(returning: (account: account, width: width, height: height, etag: etag, responseData: responseData, error: error)) @@ -520,9 +520,9 @@ public extension NextcloudKit { } } - func getUserMetadata(account: String, - userId: String, - options: NKRequestOptions = NKRequestOptions()) async -> (account: String, userProfile: NKUserProfile?, responseData: AFDataResponse?, error: NKError) { + func getUserMetadataAsync(account: String, + userId: String, + options: NKRequestOptions = NKRequestOptions()) async -> (account: String, userProfile: NKUserProfile?, responseData: AFDataResponse?, error: NKError) { await withUnsafeContinuation({ continuation in NextcloudKit.shared.getUserMetadata(account: account, userId: userId) { account, userProfile, responseData, error in continuation.resume(returning: (account: account, userProfile: userProfile, responseData: responseData, error: error)) diff --git a/Sources/NextcloudKit/NextcloudKit+E2EE.swift b/Sources/NextcloudKit/NextcloudKit+E2EE.swift index f75db087..434ee018 100644 --- a/Sources/NextcloudKit/NextcloudKit+E2EE.swift +++ b/Sources/NextcloudKit/NextcloudKit+E2EE.swift @@ -48,10 +48,10 @@ public extension NextcloudKit { } } - func markE2EEFolder(fileId: String, - delete: Bool, - account: String, - options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse?, error: NKError) { + func markE2EEFolderAsync(fileId: String, + delete: Bool, + account: String, + options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse?, error: NKError) { await withUnsafeContinuation({ continuation in NextcloudKit.shared.markE2EEFolder(fileId: fileId, delete: delete, account: account, options: options) { account, responseData, error in continuation.resume(returning: (account: account, responseData: responseData, error: error)) @@ -112,12 +112,12 @@ public extension NextcloudKit { } } - func lockE2EEFolder(fileId: String, - e2eToken: String?, - e2eCounter: String?, - method: String, - account: String, - options: NKRequestOptions = NKRequestOptions()) async -> (account: String, e2eToken: String?, responseData: AFDataResponse?, error: NKError) { + func lockE2EEFolderAsync(fileId: String, + e2eToken: String?, + e2eCounter: String?, + method: String, + account: String, + options: NKRequestOptions = NKRequestOptions()) async -> (account: String, e2eToken: String?, responseData: AFDataResponse?, error: NKError) { await withUnsafeContinuation({ continuation in NextcloudKit.shared.lockE2EEFolder(fileId: fileId, e2eToken: e2eToken, e2eCounter: e2eCounter, method: method, account: account, options: options) { account, e2eToken, responseData, error in continuation.resume(returning: (account: account, e2eToken: e2eToken, responseData: responseData, error: error)) @@ -226,13 +226,13 @@ public extension NextcloudKit { } } - func putE2EEMetadata(fileId: String, - e2eToken: String, - e2eMetadata: String?, - signature: String?, - method: String, - account: String, - options: NKRequestOptions = NKRequestOptions()) async -> (account: String, metadata: String?, responseData: AFDataResponse?, error: NKError) { + func putE2EEMetadataAsync(fileId: String, + e2eToken: String, + e2eMetadata: String?, + signature: String?, + method: String, + account: String, + options: NKRequestOptions = NKRequestOptions()) async -> (account: String, metadata: String?, responseData: AFDataResponse?, error: NKError) { await withUnsafeContinuation({ continuation in NextcloudKit.shared.putE2EEMetadata(fileId: fileId, e2eToken: e2eToken, e2eMetadata: e2eMetadata, signature: signature, method: method, account: account, options: options) { account, metadata, responseData, error in continuation.resume(returning: (account: account, metadata: metadata, responseData: responseData, error: error)) @@ -296,9 +296,9 @@ public extension NextcloudKit { } } - func getE2EECertificate(user: String? = nil, - account: String, - options: NKRequestOptions = NKRequestOptions()) async -> (account: String, certificate: String?, certificateUser: String?, responseData: AFDataResponse?, error: NKError) { + func getE2EECertificateAsync(user: String? = nil, + account: String, + options: NKRequestOptions = NKRequestOptions()) async -> (account: String, certificate: String?, certificateUser: String?, responseData: AFDataResponse?, error: NKError) { await withUnsafeContinuation({ continuation in NextcloudKit.shared.getE2EECertificate(user: user, account: account, options: options) { account, certificate, certificateUser, responseData, error in continuation.resume(returning: (account: account, certificate: certificate, certificateUser: certificateUser, responseData: responseData, error: error)) diff --git a/Sources/NextcloudKit/NextcloudKit+Livephoto.swift b/Sources/NextcloudKit/NextcloudKit+Livephoto.swift index 318d72bd..2eda50d7 100644 --- a/Sources/NextcloudKit/NextcloudKit+Livephoto.swift +++ b/Sources/NextcloudKit/NextcloudKit+Livephoto.swift @@ -49,10 +49,10 @@ public extension NextcloudKit { } } - func setLivephoto(serverUrlfileNamePath: String, - livePhotoFile: String, - account: String, - options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse?, error: NKError) { + func setLivephotoAsync(serverUrlfileNamePath: String, + livePhotoFile: String, + account: String, + options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse?, error: NKError) { await withUnsafeContinuation({ continuation in NextcloudKit.shared.setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath, livePhotoFile: livePhotoFile, account: account, options: options) { account, responseData, error in continuation.resume(returning: (account: account, responseData: responseData, error: error)) diff --git a/Sources/NextcloudKit/NextcloudKit+NCText.swift b/Sources/NextcloudKit/NextcloudKit+NCText.swift index 4e4c703e..7338416c 100644 --- a/Sources/NextcloudKit/NextcloudKit+NCText.swift +++ b/Sources/NextcloudKit/NextcloudKit+NCText.swift @@ -151,7 +151,8 @@ public extension NextcloudKit { } } - func textGetListOfTemplates(account: String, options: NKRequestOptions = NKRequestOptions()) async -> (account: String, templates: [NKEditorTemplates]?, responseData: AFDataResponse?, error: NKError) { + func textGetListOfTemplatesAsync(account: String, + options: NKRequestOptions = NKRequestOptions()) async -> (account: String, templates: [NKEditorTemplates]?, responseData: AFDataResponse?, error: NKError) { await withUnsafeContinuation({ continuation in textGetListOfTemplates(account: account) { account, templates, responseData, error in continuation.resume(returning: (account: account, templates: templates, responseData: responseData, error: error)) diff --git a/Sources/NextcloudKit/NextcloudKit+RecommendedFiles.swift b/Sources/NextcloudKit/NextcloudKit+RecommendedFiles.swift index e2bb8311..688c28a6 100644 --- a/Sources/NextcloudKit/NextcloudKit+RecommendedFiles.swift +++ b/Sources/NextcloudKit/NextcloudKit+RecommendedFiles.swift @@ -51,8 +51,8 @@ public extension NextcloudKit { options.queue.async { request(tosRequest) } } - func getRecommendedFiles(account: String, - options: NKRequestOptions = NKRequestOptions()) async -> (account: String, recommendations: [NKRecommendation]?, responseData: AFDataResponse?, error: NKError) { + func getRecommendedFilesAsync(account: String, + options: NKRequestOptions = NKRequestOptions()) async -> (account: String, recommendations: [NKRecommendation]?, responseData: AFDataResponse?, error: NKError) { await withUnsafeContinuation({ continuation in NextcloudKit.shared.getRecommendedFiles(account: account, options: options) { account, recommendations, responseData, error in continuation.resume(returning: (account: account, recommendations: recommendations, responseData: responseData, error: error)) diff --git a/Sources/NextcloudKit/NextcloudKit+Richdocuments.swift b/Sources/NextcloudKit/NextcloudKit+Richdocuments.swift index 5abb0df0..1d7445ba 100644 --- a/Sources/NextcloudKit/NextcloudKit+Richdocuments.swift +++ b/Sources/NextcloudKit/NextcloudKit+Richdocuments.swift @@ -90,7 +90,9 @@ public extension NextcloudKit { } } - func getTemplatesRichdocuments(typeTemplate: String, account: String, options: NKRequestOptions = NKRequestOptions()) async -> (account: String, templates: [NKRichdocumentsTemplate]?, responseData: AFDataResponse?, error: NKError) { + func getTemplatesRichdocumentsAsync(typeTemplate: String, + account: String, + options: NKRequestOptions = NKRequestOptions()) async -> (account: String, templates: [NKRichdocumentsTemplate]?, responseData: AFDataResponse?, error: NKError) { await withUnsafeContinuation({ continuation in NextcloudKit.shared.getTemplatesRichdocuments(typeTemplate: typeTemplate, account: account, options: options) { account, templates, responseData, error in continuation.resume(returning: (account: account, templates: templates, responseData: responseData, error: error)) diff --git a/Sources/NextcloudKit/NextcloudKit+WebDAV.swift b/Sources/NextcloudKit/NextcloudKit+WebDAV.swift index 2f863e79..f2d2248d 100644 --- a/Sources/NextcloudKit/NextcloudKit+WebDAV.swift +++ b/Sources/NextcloudKit/NextcloudKit+WebDAV.swift @@ -52,9 +52,9 @@ public extension NextcloudKit { } } - func createFolder(serverUrlFileName: String, - account: String, - options: NKRequestOptions = NKRequestOptions()) async -> (account: String, ocId: String?, date: Date?, responseData: AFDataResponse?, error: NKError) { + func createFolderAsync(serverUrlFileName: String, + account: String, + options: NKRequestOptions = NKRequestOptions()) async -> (account: String, ocId: String?, date: Date?, responseData: AFDataResponse?, error: NKError) { await withUnsafeContinuation({ continuation in NextcloudKit.shared.createFolder(serverUrlFileName: serverUrlFileName, account: account, options: options) { account, ocId, date, responseData, error in continuation.resume(returning: (account: account, ocId: ocId, date: date, responseData: responseData, error: error)) @@ -97,9 +97,9 @@ public extension NextcloudKit { } } - func deleteFileOrFolder(serverUrlFileName: String, - account: String, - options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse?, error: NKError) { + func deleteFileOrFolderAsync(serverUrlFileName: String, + account: String, + options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse?, error: NKError) { await withUnsafeContinuation({ continuation in NextcloudKit.shared.deleteFileOrFolder(serverUrlFileName: serverUrlFileName, account: account, options: options) { account, responseData, error in continuation.resume(returning: (account: account, responseData: responseData, error: error)) @@ -151,11 +151,11 @@ public extension NextcloudKit { } } - func moveFileOrFolder(serverUrlFileNameSource: String, - serverUrlFileNameDestination: String, - overwrite: Bool, - account: String, - options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse?, error: NKError) { + func moveFileOrFolderAsync(serverUrlFileNameSource: String, + serverUrlFileNameDestination: String, + overwrite: Bool, + account: String, + options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse?, error: NKError) { await withUnsafeContinuation({ continuation in NextcloudKit.shared.moveFileOrFolder(serverUrlFileNameSource: serverUrlFileNameSource, serverUrlFileNameDestination: serverUrlFileNameDestination, overwrite: overwrite, account: account, options: options) { account, responseData, error in continuation.resume(returning: (account: account, responseData: responseData, error: error)) @@ -208,11 +208,11 @@ public extension NextcloudKit { } } - func copyFileOrFolder(serverUrlFileNameSource: String, - serverUrlFileNameDestination: String, - overwrite: Bool, - account: String, - options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse?, error: NKError) { + func copyFileOrFolderAsync(serverUrlFileNameSource: String, + serverUrlFileNameDestination: String, + overwrite: Bool, + account: String, + options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse?, error: NKError) { await withUnsafeContinuation({ continuation in NextcloudKit.shared.copyFileOrFolder(serverUrlFileNameSource: serverUrlFileNameSource, serverUrlFileNameDestination: serverUrlFileNameDestination, overwrite: overwrite, account: account, options: options) { account, responseData, error in continuation.resume(returning: (account: account, responseData: responseData, error: error)) @@ -282,12 +282,12 @@ public extension NextcloudKit { } } - func readFileOrFolder(serverUrlFileName: String, - depth: String, - showHiddenFiles: Bool = true, - requestBody: Data? = nil, - account: String, - options: NKRequestOptions = NKRequestOptions()) async -> (account: String, files: [NKFile]?, responseData: AFDataResponse?, error: NKError) { + func readFileOrFolderAsync(serverUrlFileName: String, + depth: String, + showHiddenFiles: Bool = true, + requestBody: Data? = nil, + account: String, + options: NKRequestOptions = NKRequestOptions()) async -> (account: String, files: [NKFile]?, responseData: AFDataResponse?, error: NKError) { await withUnsafeContinuation({ continuation in NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrlFileName, depth: depth, showHiddenFiles: showHiddenFiles, requestBody: requestBody, account: account, options: options) { account, files, responseData, error in continuation.resume(returning: (account: account, files: files, responseData: responseData, error: error)) @@ -502,10 +502,10 @@ public extension NextcloudKit { } } - func setFavorite(fileName: String, - favorite: Bool, - account: String, - options: NKRequestOptions = NKRequestOptions()) async -> NKError { + func setFavoriteAsync(fileName: String, + favorite: Bool, + account: String, + options: NKRequestOptions = NKRequestOptions()) async -> NKError { await withUnsafeContinuation({ continuation in NextcloudKit.shared.setFavorite(fileName: fileName, favorite: favorite, account: account) { _, _, error in continuation.resume(returning: error) @@ -564,6 +564,17 @@ public extension NextcloudKit { } } + func listingFavoritesAsync(showHiddenFiles: Bool, + includeHiddenFiles: [String] = [], + account: String, + options: NKRequestOptions = NKRequestOptions()) async -> (account: String, files: [NKFile]?, responseData: AFDataResponse?, error: NKError) { + await withUnsafeContinuation({ continuation in + NextcloudKit.shared.listingFavorites(showHiddenFiles: showHiddenFiles, includeHiddenFiles: includeHiddenFiles, account: account, options: options) { account, files, data, error in + continuation.resume(returning: (account, files, data, error)) + } + }) + } + func listingTrash(filename: String? = nil, showHiddenFiles: Bool, account: String,