FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add automatic zone creation.

This commit is contained in:
Maurice Parker 2020-03-28 08:30:25 -05:00
parent 6d085fdacf
commit fe2297213d
2 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Frameworks/Account/CloudKit/CloudKitAccountZone.swift
View File

@ -31,7 +31,14 @@ final class CloudKitAccountZone: CloudKitZone {
record["editedName"] = editedName
}
save(record: record, completion: completion)
modify(recordsToStore: [record], recordIDsToDelete: []) { result in
switch result {
case .success:
completion(.success(record.recordID.recordName))
case .failure(let error):
completion(.failure(error))
}
}
}
// private func fetchChangesInZones(_ callback: ((Error?) -> Void)? = nil) {

43
Frameworks/Account/CloudKit/CloudKitZone.swift
View File

@ -113,36 +113,9 @@ extension CloudKitZone {
// })
// }
public func save(record: CKRecord, completion: @escaping (Result<String, Error>) -> Void) {
database.save(record) {(savedRecord, error) in
switch CloudKitResult.resolve(error) {
case .success:
DispatchQueue.main.async {
if let savedRecord = savedRecord {
completion(.success(savedRecord.recordID.recordName))
} else {
completion(.failure(CloudKitZoneError.unknown))
}
}
case .retry(let timeToWait):
self.retryOperationIfPossible(retryAfter: timeToWait) {
self.save(record: record, completion: completion)
}
default:
return
}
}
}
/// Sync local data to CloudKit
/// For more about the savePolicy: https://developer.apple.com/documentation/cloudkit/ckrecordsavepolicy
public func syncRecordsToCloudKit(recordsToStore: [CKRecord], recordIDsToDelete: [CKRecord.ID], completion: @escaping (Result<Void, Error>) -> Void) {
public func modify(recordsToStore: [CKRecord], recordIDsToDelete: [CKRecord.ID], completion: @escaping (Result<Void, Error>) -> Void) {
let op = CKModifyRecordsOperation(recordsToSave: recordsToStore, recordIDsToDelete: recordIDsToDelete)
let config = CKOperation.Configuration()
@ -167,16 +140,26 @@ extension CloudKitZone {
DispatchQueue.main.async {
completion(.success(()))
}
case .noZone:
self.createZoneRecord() { result in
// TODO: Need to rebuild (push) zone data here...
switch result {
case .success:
self.modify(recordsToStore: recordsToStore, recordIDsToDelete: recordIDsToDelete, completion: completion)
case .failure(let error):
completion(.failure(error))
}
}
case .retry(let timeToWait):
self.retryOperationIfPossible(retryAfter: timeToWait) {
self.syncRecordsToCloudKit(recordsToStore: recordsToStore, recordIDsToDelete: recordIDsToDelete, completion: completion)
self.modify(recordsToStore: recordsToStore, recordIDsToDelete: recordIDsToDelete, completion: completion)
}
case .chunk:
/// CloudKit says maximum number of items in a single request is 400.
/// So I think 300 should be fine by them.
let chunkedRecords = recordsToStore.chunked(into: 300)
for chunk in chunkedRecords {
self.syncRecordsToCloudKit(recordsToStore: chunk, recordIDsToDelete: recordIDsToDelete, completion: completion)
self.modify(recordsToStore: chunk, recordIDsToDelete: recordIDsToDelete, completion: completion)
}
default:
return