From 26321ee01dbe47cbcde4035c92999b71bd41b833 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sat, 13 Apr 2024 12:29:13 -0700 Subject: [PATCH] Replaced deprecated recordFetchedBlock with recordMatchedBlock. --- .../Sources/CloudKitExtras/CloudKitZone.swift | 44 ++++++++++++++----- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/CloudKitExtras/Sources/CloudKitExtras/CloudKitZone.swift b/CloudKitExtras/Sources/CloudKitExtras/CloudKitZone.swift index c9a993255..51d98750b 100644 --- a/CloudKitExtras/Sources/CloudKitExtras/CloudKitZone.swift +++ b/CloudKitExtras/Sources/CloudKitExtras/CloudKitZone.swift @@ -286,8 +286,13 @@ public extension CloudKitZone { op.desiredKeys = desiredKeys } - op.recordFetchedBlock = { record in - records.append(record) + op.recordMatchedBlock = { recordID, recordResult in + switch recordResult { + case .success(let record): + records.append(record) + case .failure(let error): + os_log(.error, log: self.log, "query recordMatchedBlock error recordID: %@ error: %@", recordID, error.localizedDescription) + } } op.queryCompletionBlock = { [weak self] (cursor, error) in @@ -361,10 +366,15 @@ public extension CloudKitZone { op.desiredKeys = desiredKeys } - op.recordFetchedBlock = { record in - records.append(record) + op.recordMatchedBlock = { recordID, recordResult in + switch recordResult { + case .success(let record): + records.append(record) + case .failure(let error): + os_log(.error, log: self.log, "query cursor recordMatchedBlock error recordID: %@ error: %@", recordID, error.localizedDescription) + } } - + op.queryCompletionBlock = { [weak self] (newCursor, error) in guard let self = self else { completion(.failure(CloudKitZoneError.unknown)) @@ -677,10 +687,16 @@ public extension CloudKitZone { let op = CKQueryOperation(query: ckQuery) op.qualityOfService = Self.qualityOfService - op.recordFetchedBlock = { record in - records.append(record) + + op.recordMatchedBlock = { recordID, recordResult in + switch recordResult { + case .success(let record): + records.append(record) + case .failure(let error): + os_log(.error, log: self.log, "delete query recordMatchedBlock error recordID: %@ error: %@", recordID, error.localizedDescription) + } } - + op.queryCompletionBlock = { [weak self] (cursor, error) in guard let self = self else { completion(.failure(CloudKitZoneError.unknown)) @@ -729,10 +745,16 @@ public extension CloudKitZone { let op = CKQueryOperation(cursor: cursor) op.qualityOfService = Self.qualityOfService - op.recordFetchedBlock = { record in - records.append(record) + + op.recordMatchedBlock = { recordID, recordResult in + switch recordResult { + case .success(let record): + records.append(record) + case .failure(let error): + os_log(.error, log: self.log, "delete cursor recordMatchedBlock error recordID: %@ error: %@", recordID, error.localizedDescription) + } } - + op.queryCompletionBlock = { [weak self] (cursor, error) in guard let self = self else { completion(.failure(CloudKitZoneError.unknown))