Add main func for synchronous work to override

MixinNetwork · Mar 8, 2022 · 9d9d51f · 9d9d51f
1 parent 5539e46
commit 9d9d51f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/Mixin/Service/Work/AttachmentCleaningWork.swift b/Mixin/Service/Work/AttachmentCleaningWork.swift
@@ -16,10 +16,8 @@ final class AttachmentCleaningWork: Work {
         super.init(id: "attachment_clean", state: .ready)
     }
 
-    override func start() {
-        super.start()
+    override func main() throws {
         guard -AppGroupUserDefaults.User.lastAttachmentCleanUpDate.timeIntervalSinceNow >= 7 * .oneDay else {
-            state = .finished(.cancelled)
             return
         }
 
@@ -58,7 +56,6 @@ final class AttachmentCleaningWork: Work {
         }
 
         AppGroupUserDefaults.User.lastAttachmentCleanUpDate = Date()
-        state = .finished(.success)
     }
 
 }

diff --git a/MixinServices/MixinServices/Services/Work/DeleteMessageWork.swift b/MixinServices/MixinServices/Services/Work/DeleteMessageWork.swift
@@ -57,8 +57,7 @@ public final class DeleteMessageWork: Work {
         super.init(id: "delete-message-\(messageId)", state: .ready)
     }
 
-    override public func start() {
-        super.start()
+    public override func main() throws {
         if !hasDatabaseRecordDeleted {
             MessageDAO.shared.delete(id: messageId, conversationId: conversationId)
         }
@@ -79,7 +78,6 @@ public final class DeleteMessageWork: Work {
         case .none:
             break
         }
-        state = .finished(.success)
     }
 
 }

diff --git a/MixinServices/MixinServices/Services/Work/Work.swift b/MixinServices/MixinServices/Services/Work/Work.swift
@@ -32,8 +32,20 @@ open class Work {
         }
     }
 
+    // Override this if you want precisely control of state
     open func start() {
         state = .executing
+        do {
+            try main()
+            state = .finished(.success)
+        } catch {
+            state = .finished(.failed(error))
+        }
+    }
+
+    // Override this for straight synchronous works
+    open func main() throws {
+
     }
 
     open func cancel() {

diff --git a/MixinServices/MixinServices/Services/Work/WorkManager.swift b/MixinServices/MixinServices/Services/Work/WorkManager.swift
@@ -91,7 +91,7 @@ public class WorkManager {
                                 completion: work.persistenceDidComplete)
         }
         if work.isReady, executingWorks.count < maxConcurrentWorkCount {
-            Logger.general.debug(category: "WorkManager", message: "[\(label)] Execute \(work) because of adding to queue")
+            Logger.general.debug(category: "WorkManager", message: "[\(label)] Start \(work) because of adding to queue")
             executingWorks.insert(work)
             dispatchQueue.async(execute: work.start)
         } else {