Rename save to performAndSave

Author: crazytonyli

WordPress/Classes/Services/BloggingPromptsService.swift

@@ -331,7 +331,7 @@ private extension BloggingPromptsService {
     ///   - remoteSettings: The blogging prompt settings from the remote.
     ///   - completion: Closure to be called on completion.
     func saveSettings(_ remoteSettings: RemoteBloggingPromptsSettings, completion: @escaping () -> Void) {
-        contextManager.save { derivedContext in
+        contextManager.performAndSave { derivedContext in
             let settings = self.loadSettings(context: derivedContext) ?? BloggingPromptSettings(context: derivedContext)
             settings.configure(with: remoteSettings, siteID: self.siteID.int32Value, context: derivedContext)
         } completion: {

WordPress/Classes/Services/CommentService+Likes.swift

@@ -94,7 +94,7 @@ private extension CommentService {
             return
         }
 
-        ContextManager.shared.save { derivedContext in
+        ContextManager.shared.performAndSave { derivedContext in
             let likers = remoteLikeUsers.map { remoteUser in
                 LikeUserHelper.createOrUpdateFrom(remoteUser: remoteUser, context: derivedContext)
             }

WordPress/Classes/Services/LikeUserHelpers.swift

@@ -59,7 +59,7 @@ import CoreData
     }
 
     class func purgeStaleLikes() {
-        ContextManager.shared.save {
+        ContextManager.shared.performAndSave {
             purgeStaleLikes(fromContext: $0)
         }
     }

WordPress/Classes/Services/PlanService.swift

@@ -236,7 +236,7 @@ extension PlanService {
 
 struct PlanStorage {
     static func activatePlan(_ planID: Int, forSite siteID: Int) {
-        ContextManager.shared.save { context in
+        ContextManager.shared.performAndSave { context in
             guard let blog = try? Blog.lookup(withID: siteID, in: context) else {
                 let error = "Tried to activate a plan for a non-existing site (ID: \(siteID))"
                 assertionFailure(error)
@@ -250,7 +250,7 @@ struct PlanStorage {
     }
 
     static func updateHasDomainCredit(_ planID: Int, forSite siteID: Int, hasDomainCredit: Bool) {
-        ContextManager.shared.save { context in
+        ContextManager.shared.performAndSave { context in
             guard let blog = try? Blog.lookup(withID: siteID, in: context) else {
                 let error = "Tried to update a plan for a non-existing site (ID: \(siteID))"
                 assertionFailure(error)

WordPress/Classes/Services/PostService+Likes.swift

@@ -94,7 +94,7 @@ private extension PostService {
             return
         }
 
-        ContextManager.shared.save { derivedContext in
+        ContextManager.shared.performAndSave { derivedContext in
             let likers = remoteLikeUsers.map { remoteUser in
                 LikeUserHelper.createOrUpdateFrom(remoteUser: remoteUser, context: derivedContext)
             }

WordPress/Classes/Utility/ContextManager.h

@@ -16,8 +16,8 @@ FOUNDATION_EXTERN NSString * const ContextManagerModelNameCurrent;
 - (void)saveContextAndWait:(NSManagedObjectContext *)context;
 - (void)saveContext:(NSManagedObjectContext *)context;
 - (void)saveContext:(NSManagedObjectContext *)context withCompletionBlock:(void (^)(void))completionBlock;
-- (void)saveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock;
-- (void)saveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock completion:(void (^)(void))completion;
+- (void)performAndSaveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock;
+- (void)performAndSaveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock completion:(void (^)(void))completion;
 @end
 
 @interface ContextManager : NSObject <CoreDataStack>

WordPress/Classes/Utility/ContextManager.m

@@ -195,7 +195,7 @@ - (void)mergeChanges:(NSManagedObjectContext *)context fromContextDidSaveNotific
     }];
 }
 
-- (void)saveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock
+- (void)performAndSaveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock
 {
     NSManagedObjectContext *context = [self newDerivedContext];
     [context performBlockAndWait:^{
@@ -205,7 +205,7 @@ - (void)saveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock
     }];
 }
 
-- (void)saveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock completion:(void (^)(void))completion
+- (void)performAndSaveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock completion:(void (^)(void))completion
 {
     NSManagedObjectContext *context = [self newDerivedContext];
     [context performBlock:^{

WordPress/WordPressTest/ContextManagerTests.swift

@@ -148,7 +148,7 @@ class ContextManagerTests: XCTestCase {
         }
         XCTAssertEqual(numberOfAccounts(), 0)
 
-        await contextManager.save { context in
+        await contextManager.performAndSave { context in
             let account = WPAccount(context: context)
             account.userID = 1
             account.username = "First User"
@@ -163,7 +163,7 @@ class ContextManagerTests: XCTestCase {
         // From: https://github.com/apple/swift-evolution/blob/main/proposals/0296-async-await.md#overloading-and-overload-resolution
         // > "In non-async functions, and closures without any await expression, the compiler selects the non-async overload"
         let sync: () -> Void = {
-            contextManager.save { context in
+            contextManager.performAndSave { context in
                 let account = WPAccount(context: context)
                 account.userID = 2
                 account.username = "Second User"
@@ -187,12 +187,12 @@ class ContextManagerTests: XCTestCase {
             self.expectation(description: "Second User is saved"),
         ]
 
-        contextManager.save {
+        contextManager.performAndSave {
             let account = WPAccount(context: $0)
             account.userID = 1
             account.username = "First User"
 
-            contextManager.save {
+            contextManager.performAndSave {
                 let account = WPAccount(context: $0)
                 account.userID = 2
                 account.username = "Second User"