Apply code style

MixinNetwork · Mar 15, 2022 · 391bbd3 · 391bbd3
1 parent a1ca2d0
commit 391bbd3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/Mixin/Service/Work/AttachmentCleaningWork.swift b/Mixin/Service/Work/AttachmentCleaningWork.swift
@@ -3,8 +3,6 @@ import MixinServices
 
 final class AttachmentCleaningWork: Work {
 
-    private let finishedCategoriesLock = NSRecursiveLock()
-
     private var finishedCategories: Set<AttachmentContainer.Category>
 
     convenience init() {
@@ -20,13 +18,9 @@ final class AttachmentCleaningWork: Work {
         guard -AppGroupUserDefaults.User.lastAttachmentCleanUpDate.timeIntervalSinceNow >= 7 * .oneDay else {
             return
         }
-
-        finishedCategoriesLock.lock()
         let categories: [AttachmentContainer.Category] = [.photos, .audios, .files, .videos].filter { category in
             !finishedCategories.contains(category)
         }
-        finishedCategoriesLock.unlock()
-
         for category in categories {
             Logger.general.debug(category: "AttachmentCleaningWork", message: "Cleaning \(category)")
             let path = AttachmentContainer.url(for: category, filename: nil).path
@@ -48,13 +42,10 @@ final class AttachmentCleaningWork: Work {
                     try? FileManager.default.removeItem(at: url)
                 }
             }
-            finishedCategoriesLock.lock()
             finishedCategories.insert(category)
             updatePersistedContext()
-            finishedCategoriesLock.unlock()
             Logger.general.debug(category: "AttachmentCleaningWork", message: "\(category) cleaned up")
         }
-
         AppGroupUserDefaults.User.lastAttachmentCleanUpDate = Date()
     }
 
@@ -65,10 +56,7 @@ extension AttachmentCleaningWork: PersistableWork {
     static let typeIdentifier: String = "attachment_clean"
 
     var context: Data? {
-        finishedCategoriesLock.lock()
-        let categories = finishedCategories
-        finishedCategoriesLock.unlock()
-        return try? JSONEncoder.default.encode(categories)
+        try? JSONEncoder.default.encode(finishedCategories)
     }
 
     var priority: PersistedWork.Priority {

diff --git a/MixinServices/MixinServices/Services/Work/DeleteMessageWork.swift b/MixinServices/MixinServices/Services/Work/DeleteMessageWork.swift
@@ -17,6 +17,22 @@ extension MessageItem: DeletableMessage {
 
 }
 
+/*
+ Straight execute
+ ┌───────────────┐  ┌───────────┐Completed┌────────────────┐
+ │Init(preparing)├─►│Persistence├────────►│Delete DB Record│
+ └───────────────┘  └───────────┘         └────┬───────────┘
+                                               │
+                 ┌───────────┐Execute┌─────┐   │Completed
+                 │Delete file│◄──────┤Ready│◄──┘
+                 └───────────┘       └─────┘
+ 
+ Awake from persistence
+ ┌────────────┐  ┌────────────────┐Completed┌───────────┐
+ │Awake(ready)├─►│Delete DB Record├────────►│Delete file│
+ └────────────┘  └────────────────┘         └───────────┘
+ */
+
 public final class DeleteMessageWork: Work {
 
     public enum Attachment: Codable {
@@ -64,6 +80,7 @@ public final class DeleteMessageWork: Work {
             state = .finished(.success)
         } else {
             MessageDAO.shared.delete(id: messageId, conversationId: conversationId) {
+                Logger.general.debug(category: "DeleteMessageWork", message: "\(self.messageId) Message deleted from database")
                 self.deleteFile()
                 self.state = .finished(.success)
             }