Skip to content

Commit 7bac9c2

Browse files
marinofaggianamarinofaggiana
authored
Merge pull request #146 from nextcloud/async
async-await
2 parents 8ac6704 + f779d71 commit 7bac9c2

7 files changed

Lines changed: 80 additions & 66 deletions

‎Sources/NextcloudKit/NextcloudKit+API.swift‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@ public extension NextcloudKit {
216216
}
217217
}
218218

219-
func getServerStatus(serverUrl: String,
220-
options: NKRequestOptions = NKRequestOptions()) async -> NextcloudKit.ServerInfoResult {
219+
func getServerStatusAsync(serverUrl: String,
220+
options: NKRequestOptions = NKRequestOptions()) async -> NextcloudKit.ServerInfoResult {
221221
await withUnsafeContinuation({ continuation in
222222
NextcloudKit.shared.getServerStatus(serverUrl: serverUrl) { _, serverInfoResult in
223223
continuation.resume(returning: serverInfoResult)
@@ -260,9 +260,9 @@ public extension NextcloudKit {
260260
}
261261
}
262262

263-
func downloadPreview(url: URL,
264-
account: String,
265-
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse<Data?>?, error: NKError) {
263+
func downloadPreviewAsync(url: URL,
264+
account: String,
265+
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse<Data?>?, error: NKError) {
266266
await withUnsafeContinuation({ continuation in
267267
NextcloudKit.shared.downloadPreview(url: url, account: account, options: options) { account, responseData, error in
268268
continuation.resume(returning: (account: account, responseData: responseData, error: error))
@@ -312,10 +312,10 @@ public extension NextcloudKit {
312312
}
313313
}
314314

315-
func downloadPreview(fileId: String,
316-
etag: String? = nil,
317-
account: String,
318-
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, width: Int, height: Int, etag: String?, responseData: AFDataResponse<Data?>?, error: NKError) {
315+
func downloadPreviewAsync(fileId: String,
316+
etag: String? = nil,
317+
account: String,
318+
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, width: Int, height: Int, etag: String?, responseData: AFDataResponse<Data?>?, error: NKError) {
319319
await withUnsafeContinuation({ continuation in
320320
NextcloudKit.shared.downloadPreview(fileId: fileId, etag: etag, account: account, options: options) { account, width, height, etag, responseData, error in
321321
continuation.resume(returning: (account: account, width: width, height: height, etag: etag, responseData: responseData, error: error))
@@ -531,9 +531,9 @@ public extension NextcloudKit {
531531
}
532532
}
533533

534-
func getUserMetadata(account: String,
535-
userId: String,
536-
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, userProfile: NKUserProfile?, responseData: AFDataResponse<Data>?, error: NKError) {
534+
func getUserMetadataAsync(account: String,
535+
userId: String,
536+
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, userProfile: NKUserProfile?, responseData: AFDataResponse<Data>?, error: NKError) {
537537
await withUnsafeContinuation({ continuation in
538538
NextcloudKit.shared.getUserMetadata(account: account, userId: userId) { account, userProfile, responseData, error in
539539
continuation.resume(returning: (account: account, userProfile: userProfile, responseData: responseData, error: error))

‎Sources/NextcloudKit/NextcloudKit+E2EE.swift‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ public extension NextcloudKit {
4848
}
4949
}
5050

51-
func markE2EEFolder(fileId: String,
52-
delete: Bool,
53-
account: String,
54-
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse<Data>?, error: NKError) {
51+
func markE2EEFolderAsync(fileId: String,
52+
delete: Bool,
53+
account: String,
54+
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse<Data>?, error: NKError) {
5555
await withUnsafeContinuation({ continuation in
5656
NextcloudKit.shared.markE2EEFolder(fileId: fileId, delete: delete, account: account, options: options) { account, responseData, error in
5757
continuation.resume(returning: (account: account, responseData: responseData, error: error))
@@ -112,12 +112,12 @@ public extension NextcloudKit {
112112
}
113113
}
114114

115-
func lockE2EEFolder(fileId: String,
116-
e2eToken: String?,
117-
e2eCounter: String?,
118-
method: String,
119-
account: String,
120-
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, e2eToken: String?, responseData: AFDataResponse<Data>?, error: NKError) {
115+
func lockE2EEFolderAsync(fileId: String,
116+
e2eToken: String?,
117+
e2eCounter: String?,
118+
method: String,
119+
account: String,
120+
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, e2eToken: String?, responseData: AFDataResponse<Data>?, error: NKError) {
121121
await withUnsafeContinuation({ continuation in
122122
NextcloudKit.shared.lockE2EEFolder(fileId: fileId, e2eToken: e2eToken, e2eCounter: e2eCounter, method: method, account: account, options: options) { account, e2eToken, responseData, error in
123123
continuation.resume(returning: (account: account, e2eToken: e2eToken, responseData: responseData, error: error))
@@ -226,13 +226,13 @@ public extension NextcloudKit {
226226
}
227227
}
228228

229-
func putE2EEMetadata(fileId: String,
230-
e2eToken: String,
231-
e2eMetadata: String?,
232-
signature: String?,
233-
method: String,
234-
account: String,
235-
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, metadata: String?, responseData: AFDataResponse<Data>?, error: NKError) {
229+
func putE2EEMetadataAsync(fileId: String,
230+
e2eToken: String,
231+
e2eMetadata: String?,
232+
signature: String?,
233+
method: String,
234+
account: String,
235+
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, metadata: String?, responseData: AFDataResponse<Data>?, error: NKError) {
236236
await withUnsafeContinuation({ continuation in
237237
NextcloudKit.shared.putE2EEMetadata(fileId: fileId, e2eToken: e2eToken, e2eMetadata: e2eMetadata, signature: signature, method: method, account: account, options: options) { account, metadata, responseData, error in
238238
continuation.resume(returning: (account: account, metadata: metadata, responseData: responseData, error: error))
@@ -296,9 +296,9 @@ public extension NextcloudKit {
296296
}
297297
}
298298

299-
func getE2EECertificate(user: String? = nil,
300-
account: String,
301-
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, certificate: String?, certificateUser: String?, responseData: AFDataResponse<Data>?, error: NKError) {
299+
func getE2EECertificateAsync(user: String? = nil,
300+
account: String,
301+
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, certificate: String?, certificateUser: String?, responseData: AFDataResponse<Data>?, error: NKError) {
302302
await withUnsafeContinuation({ continuation in
303303
NextcloudKit.shared.getE2EECertificate(user: user, account: account, options: options) { account, certificate, certificateUser, responseData, error in
304304
continuation.resume(returning: (account: account, certificate: certificate, certificateUser: certificateUser, responseData: responseData, error: error))

‎Sources/NextcloudKit/NextcloudKit+Livephoto.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ public extension NextcloudKit {
4949
}
5050
}
5151

52-
func setLivephoto(serverUrlfileNamePath: String,
53-
livePhotoFile: String,
54-
account: String,
55-
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse<Data?>?, error: NKError) {
52+
func setLivephotoAsync(serverUrlfileNamePath: String,
53+
livePhotoFile: String,
54+
account: String,
55+
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse<Data?>?, error: NKError) {
5656
await withUnsafeContinuation({ continuation in
5757
NextcloudKit.shared.setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath, livePhotoFile: livePhotoFile, account: account, options: options) { account, responseData, error in
5858
continuation.resume(returning: (account: account, responseData: responseData, error: error))

‎Sources/NextcloudKit/NextcloudKit+NCText.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ public extension NextcloudKit {
151151
}
152152
}
153153

154-
func textGetListOfTemplates(account: String, options: NKRequestOptions = NKRequestOptions()) async -> (account: String, templates: [NKEditorTemplates]?, responseData: AFDataResponse<Data>?, error: NKError) {
154+
func textGetListOfTemplatesAsync(account: String,
155+
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, templates: [NKEditorTemplates]?, responseData: AFDataResponse<Data>?, error: NKError) {
155156
await withUnsafeContinuation({ continuation in
156157
textGetListOfTemplates(account: account) { account, templates, responseData, error in
157158
continuation.resume(returning: (account: account, templates: templates, responseData: responseData, error: error))

‎Sources/NextcloudKit/NextcloudKit+RecommendedFiles.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public extension NextcloudKit {
5151
options.queue.async { request(tosRequest) }
5252
}
5353

54-
func getRecommendedFiles(account: String,
55-
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, recommendations: [NKRecommendation]?, responseData: AFDataResponse<Data>?, error: NKError) {
54+
func getRecommendedFilesAsync(account: String,
55+
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, recommendations: [NKRecommendation]?, responseData: AFDataResponse<Data>?, error: NKError) {
5656
await withUnsafeContinuation({ continuation in
5757
NextcloudKit.shared.getRecommendedFiles(account: account, options: options) { account, recommendations, responseData, error in
5858
continuation.resume(returning: (account: account, recommendations: recommendations, responseData: responseData, error: error))

‎Sources/NextcloudKit/NextcloudKit+Richdocuments.swift‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ public extension NextcloudKit {
9090
}
9191
}
9292

93-
func getTemplatesRichdocuments(typeTemplate: String, account: String, options: NKRequestOptions = NKRequestOptions()) async -> (account: String, templates: [NKRichdocumentsTemplate]?, responseData: AFDataResponse<Data>?, error: NKError) {
93+
func getTemplatesRichdocumentsAsync(typeTemplate: String,
94+
account: String,
95+
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, templates: [NKRichdocumentsTemplate]?, responseData: AFDataResponse<Data>?, error: NKError) {
9496
await withUnsafeContinuation({ continuation in
9597
NextcloudKit.shared.getTemplatesRichdocuments(typeTemplate: typeTemplate, account: account, options: options) { account, templates, responseData, error in
9698
continuation.resume(returning: (account: account, templates: templates, responseData: responseData, error: error))

‎Sources/NextcloudKit/NextcloudKit+WebDAV.swift‎

Lines changed: 37 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ public extension NextcloudKit {
5252
}
5353
}
5454

55-
func createFolder(serverUrlFileName: String,
56-
account: String,
57-
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, ocId: String?, date: Date?, responseData: AFDataResponse<Data?>?, error: NKError) {
55+
func createFolderAsync(serverUrlFileName: String,
56+
account: String,
57+
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, ocId: String?, date: Date?, responseData: AFDataResponse<Data?>?, error: NKError) {
5858
await withUnsafeContinuation({ continuation in
5959
NextcloudKit.shared.createFolder(serverUrlFileName: serverUrlFileName, account: account, options: options) { account, ocId, date, responseData, error in
6060
continuation.resume(returning: (account: account, ocId: ocId, date: date, responseData: responseData, error: error))
@@ -97,9 +97,9 @@ public extension NextcloudKit {
9797
}
9898
}
9999

100-
func deleteFileOrFolder(serverUrlFileName: String,
101-
account: String,
102-
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse<Data?>?, error: NKError) {
100+
func deleteFileOrFolderAsync(serverUrlFileName: String,
101+
account: String,
102+
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse<Data?>?, error: NKError) {
103103
await withUnsafeContinuation({ continuation in
104104
NextcloudKit.shared.deleteFileOrFolder(serverUrlFileName: serverUrlFileName, account: account, options: options) { account, responseData, error in
105105
continuation.resume(returning: (account: account, responseData: responseData, error: error))
@@ -151,11 +151,11 @@ public extension NextcloudKit {
151151
}
152152
}
153153

154-
func moveFileOrFolder(serverUrlFileNameSource: String,
155-
serverUrlFileNameDestination: String,
156-
overwrite: Bool,
157-
account: String,
158-
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse<Data?>?, error: NKError) {
154+
func moveFileOrFolderAsync(serverUrlFileNameSource: String,
155+
serverUrlFileNameDestination: String,
156+
overwrite: Bool,
157+
account: String,
158+
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse<Data?>?, error: NKError) {
159159
await withUnsafeContinuation({ continuation in
160160
NextcloudKit.shared.moveFileOrFolder(serverUrlFileNameSource: serverUrlFileNameSource, serverUrlFileNameDestination: serverUrlFileNameDestination, overwrite: overwrite, account: account, options: options) { account, responseData, error in
161161
continuation.resume(returning: (account: account, responseData: responseData, error: error))
@@ -208,11 +208,11 @@ public extension NextcloudKit {
208208
}
209209
}
210210

211-
func copyFileOrFolder(serverUrlFileNameSource: String,
212-
serverUrlFileNameDestination: String,
213-
overwrite: Bool,
214-
account: String,
215-
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse<Data?>?, error: NKError) {
211+
func copyFileOrFolderAsync(serverUrlFileNameSource: String,
212+
serverUrlFileNameDestination: String,
213+
overwrite: Bool,
214+
account: String,
215+
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, responseData: AFDataResponse<Data?>?, error: NKError) {
216216
await withUnsafeContinuation({ continuation in
217217
NextcloudKit.shared.copyFileOrFolder(serverUrlFileNameSource: serverUrlFileNameSource, serverUrlFileNameDestination: serverUrlFileNameDestination, overwrite: overwrite, account: account, options: options) { account, responseData, error in
218218
continuation.resume(returning: (account: account, responseData: responseData, error: error))
@@ -282,12 +282,12 @@ public extension NextcloudKit {
282282
}
283283
}
284284

285-
func readFileOrFolder(serverUrlFileName: String,
286-
depth: String,
287-
showHiddenFiles: Bool = true,
288-
requestBody: Data? = nil,
289-
account: String,
290-
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, files: [NKFile]?, responseData: AFDataResponse<Data>?, error: NKError) {
285+
func readFileOrFolderAsync(serverUrlFileName: String,
286+
depth: String,
287+
showHiddenFiles: Bool = true,
288+
requestBody: Data? = nil,
289+
account: String,
290+
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, files: [NKFile]?, responseData: AFDataResponse<Data>?, error: NKError) {
291291
await withUnsafeContinuation({ continuation in
292292
NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrlFileName, depth: depth, showHiddenFiles: showHiddenFiles, requestBody: requestBody, account: account, options: options) { account, files, responseData, error in
293293
continuation.resume(returning: (account: account, files: files, responseData: responseData, error: error))
@@ -502,10 +502,10 @@ public extension NextcloudKit {
502502
}
503503
}
504504

505-
func setFavorite(fileName: String,
506-
favorite: Bool,
507-
account: String,
508-
options: NKRequestOptions = NKRequestOptions()) async -> NKError {
505+
func setFavoriteAsync(fileName: String,
506+
favorite: Bool,
507+
account: String,
508+
options: NKRequestOptions = NKRequestOptions()) async -> NKError {
509509
await withUnsafeContinuation({ continuation in
510510
NextcloudKit.shared.setFavorite(fileName: fileName, favorite: favorite, account: account) { _, _, error in
511511
continuation.resume(returning: error)
@@ -564,6 +564,17 @@ public extension NextcloudKit {
564564
}
565565
}
566566

567+
func listingFavoritesAsync(showHiddenFiles: Bool,
568+
includeHiddenFiles: [String] = [],
569+
account: String,
570+
options: NKRequestOptions = NKRequestOptions()) async -> (account: String, files: [NKFile]?, responseData: AFDataResponse<Data>?, error: NKError) {
571+
await withUnsafeContinuation({ continuation in
572+
NextcloudKit.shared.listingFavorites(showHiddenFiles: showHiddenFiles, includeHiddenFiles: includeHiddenFiles, account: account, options: options) { account, files, data, error in
573+
continuation.resume(returning: (account, files, data, error))
574+
}
575+
})
576+
}
577+
567578
func listingTrash(filename: String? = nil,
568579
showHiddenFiles: Bool,
569580
account: String,

0 commit comments

Comments
 (0)