From bb99e6f69c76868565cb0bb9413a9da2d27f43b7 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Wed, 24 Feb 2021 15:33:24 -0600
Subject: [PATCH] Simplify the compression logic

---
 .../CloudKit/CloudKitArticlesZone.swift       | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/Account/Sources/Account/CloudKit/CloudKitArticlesZone.swift b/Account/Sources/Account/CloudKit/CloudKitArticlesZone.swift
index 6947e9c6d..5c8733317 100644
--- a/Account/Sources/Account/CloudKit/CloudKitArticlesZone.swift
+++ b/Account/Sources/Account/CloudKit/CloudKitArticlesZone.swift
@@ -101,9 +101,8 @@ final class CloudKitArticlesZone: CloudKitZone {
 		}
 
 		compressionQueue.async {
-			self.compressArticleRecords(records) { compressedRecords in
-				self.save(compressedRecords, completion: completion)
-			}
+			let compressedRecords = self.compressArticleRecords(records)
+			self.save(compressedRecords, completion: completion)
 		}
 	}
 	
@@ -140,23 +139,21 @@ final class CloudKitArticlesZone: CloudKitZone {
 		}
 
 		compressionQueue.async {
-			self.compressArticleRecords(modifyRecords) { compressedModifyRecords in
-				self.compressArticleRecords(newRecords) { compressedNewRecords in
-					self.modify(recordsToSave: compressedModifyRecords, recordIDsToDelete: deleteRecordIDs) { result in
+			let compressedModifyRecords = self.compressArticleRecords(modifyRecords)
+			self.modify(recordsToSave: compressedModifyRecords, recordIDsToDelete: deleteRecordIDs) { result in
+				switch result {
+				case .success:
+					let compressedNewRecords = self.compressArticleRecords(newRecords)
+					self.saveIfNew(compressedNewRecords) { result in
 						switch result {
 						case .success:
-							self.saveIfNew(compressedNewRecords) { result in
-								switch result {
-								case .success:
-									completion(.success(()))
-								case .failure(let error):
-									completion(.failure(error))
-								}
-							}
+							completion(.success(()))
 						case .failure(let error):
-							self.handleModifyArticlesError(error, statusUpdates: statusUpdates, completion: completion)
+							completion(.failure(error))
 						}
 					}
+				case .failure(let error):
+					self.handleModifyArticlesError(error, statusUpdates: statusUpdates, completion: completion)
 				}
 			}
 		}
@@ -252,7 +249,7 @@ private extension CloudKitArticlesZone {
 		return record
 	}
 
-	func compressArticleRecords(_ records: [CKRecord], completion: ([CKRecord]) -> Void ) {
+	func compressArticleRecords(_ records: [CKRecord]) -> [CKRecord] {
 		var result = [CKRecord]()
 		
 		for record in records {
@@ -262,7 +259,7 @@ private extension CloudKitArticlesZone {
 				if let contentHTML = record[CloudKitArticle.Fields.contentHTML] as? String {
 					let data = Data(contentHTML.utf8) as NSData
 					if let compressedData = try? data.compressed(using: .lzfse) {
-						record[CloudKitArticle.Fields.contentHTMLData] = compressedData
+						record[CloudKitArticle.Fields.contentHTMLData] = compressedData as Data
 						record[CloudKitArticle.Fields.contentHTML] = nil
 					}
 				}
@@ -270,19 +267,17 @@ private extension CloudKitArticlesZone {
 				if let contentText = record[CloudKitArticle.Fields.contentText] as? String {
 					let data = Data(contentText.utf8) as NSData
 					if let compressedData = try? data.compressed(using: .lzfse) {
-						record[CloudKitArticle.Fields.contentTextData] = compressedData
+						record[CloudKitArticle.Fields.contentTextData] = compressedData as Data
 						record[CloudKitArticle.Fields.contentText] = nil
 					}
 				}
 				
-			} else {
-				
-				result.append(record)
-				
 			}
+			
+			result.append(record)
 		}
 		
-		completion(result)
+		return result
 	}
 
 }